Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	V7cma/WebContent/jsp/inc_regForm.jsp
[2014-09-26] V8 - Merge remote-tracking branch 'origin/master'