Merge branch '7.x-1.x' of http://git.drupal.org/sandbox/lahode/1325398

Conflicts:
	README.txt
	entity_reference_tree.css
	entity_reference_tree.info
	entity_reference_tree.js
	entity_reference_tree.module
	term_reference_tree/term_reference_tree.css
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: root <root@ntucmedia-web1.(none)>
#
# On branch master
# Changes to be committed:
#
#	new file:   LICENSE.txt
#	modified:   README.txt
#	new file:   entity_reference_tree.css
#	new file:   entity_reference_tree.info
#	new file:   entity_reference_tree.js
#	new file:   entity_reference_tree.module
#	new file:   entityreference_term_tree/entityreference_term_tree.css
#	new file:   entityreference_term_tree/entityreference_term_tree.field.inc
#	new file:   entityreference_term_tree/entityreference_term_tree.info
#	new file:   entityreference_term_tree/entityreference_term_tree.module
#	new file:   entityreference_term_tree/entityreference_term_tree.widget.inc
#	new file:   images/README.txt
#	new file:   oggroup_reference_tree/oggroup_reference_tree.css
#	new file:   oggroup_reference_tree/oggroup_reference_tree.field.inc
#	new file:   oggroup_reference_tree/oggroup_reference_tree.info
#	new file:   oggroup_reference_tree/oggroup_reference_tree.module
#	new file:   oggroup_reference_tree/oggroup_reference_tree.widget.inc
#	new file:   term_reference_tree/term_reference_tree.css
#	new file:   term_reference_tree/term_reference_tree.field.inc
#	new file:   term_reference_tree/term_reference_tree.info
#	new file:   term_reference_tree/term_reference_tree.module
#	new file:   term_reference_tree/term_reference_tree.widget.inc
#
