Modify User model
Merge branch 'master' of http://github.com/phamonyut/hoorayjob

Conflicts:
	app/models/user.rb
Merge branch 'master' of http://github.com/phamonyut/hoorayjob