Getting edit user to work wth angular
Merge branch 'master' of https://github.com/alindeman/pathway-homes

Conflicts:
	app/assets/javascripts/controllers/users.js
	app/assets/javascripts/services/user.js
	app/controllers/users_controller.rb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/routes.rb
Changed button styling for note modal
Merge branch 'master' of https://github.com/alindeman/pathway-homes
Got edit profiile to save, and also corrected telephone editing bug I noticed
Removes small unnecessary things
Merge branch 'edit-user'

Closes #93
Fixes request to undefined.json
For now use flash[:alert] only because it is hooked up to angular
Merge branch 'master' into add_links_for_request_types