Added first and last name to user model
Added devise views into the project
Added account settings functionality
Merge pull request #96 from theodi/account-settings

Account settings functionality, generated devise views
Merge branch 'master' into survey_generator

Conflicts:
	db/schema.rb
Merge branch 'master' into survey_generator

Conflicts:
	db/schema.rb