ADDED gems and UPDATED user model and user_spec
Merge remote-tracking branch 'origin/master' into implement_user_MVC

	SOLVED conflict in spec/models/user_spec.rb