fixed distorted views, sorted employee listing by name, host for mailer
changed
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/assets/stylesheets/intranet.css.scss