Changed hints style (and small quick fixes)
chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop

Conflicts:
	views/options/settings.jade