Fix wrong fonts
Merge branch 'develop'

Conflicts:
	public/css/style.css
Fix issue with showing email address
Fix issue with credits not assigned on register
Merge branch 'master' into develop