#2 devise added
#2 devise and user model made mandatory
#2 devise views converted erb to haml
Merge branch 'devise' into develop

Conflicts:
	templates/cybele_Gemfile
#13 remove unused method