devise integrited and all erbs converted to haml
removed erbtohaml gem as it's no longer needed
Merge branch 'master' into master_1

Conflicts:
	db/schema.rb
Merge branch 'master' into master_1

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #5 from subhash-shah-kcspl/master_1

Master 1