Removed old files and added edit option for users.
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/views/devise/registrations/edit.html.haml