fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/public/css/bootstrap-gm.css
fixes