Merge remote-tracking branch 'upstream/master' into merging

Conflicts:
	resources/public/css/ehsm.css
Merging upstream and fixing fonts in the public page.

Conflicts:
	resources/public/css/ehsm.css
Merge pull request #2 from MokshaBirk/master

Fixing fonts in the public page