refactored user_controller, more cucumber tests, better rspec tests. Also made cucumber tests for editing user profile/changing password and recovering password. Made minor changes to gemfile and devlopment.rb that will be used for mailing
fixed conflicts between password-test and master