v1.0.0 141215 test byj
Merge remote-tracking branch 'origin/master'

Conflicts:
	hopeHoff/src/main/webapp/web/main/main.html