Fixed up 'owners' in add_user a bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/css/screen.css
	public/stylesheets/sass/components/_inputs.scss