Update Gemfile with latest gem versions.
Removed permissions model and changed name validation
Remove schema.rb and add it to the ignore list.
Added getIdentifier method to User model. Returns Name if exists, else returns e-mail.
Committing for real this time.
Merge branch 'master' into login-sessions-devel

Conflicts:
	app/models/user.rb
	db/seeds.rb