15:10 11/26/2014

fix .html bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/registration.html