Improved appliation layout
Merge branch 'ExternalUser' of https://github.com/gbrego/SRA into ExternalUser

Conflicts:
	app/models/user.rb
	app/views/users/_form.html.erb