#4 add admin profile model
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop

Conflicts:
	config/routes.rb
	db/schema.rb
merge