Merge pull request #25 from tetianahogg/avatars

Avatars
Updated tabulation
Update user.rb

indentation
Update avatar_uploader.rb
Update application.html.erb

indentation
Update devise.rb
Update 20140726022156_devise_create_users.rb
Update schema.rb
Update user_spec.rb
Merge remote-tracking branch 'origin/dev' into foundation_new

Conflicts:
	app/views/layouts/application.html.erb
	spec/models/user_spec.rb