some change
Merge branch 'origin/master'

Conflicts:
	src/src/edu/rit/acn/ccnTextConf/model/CCNX_Utilities.java