changes for devise
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/devise/sessions/new.html.erb
confict resolve
Merge pull request #1 from prakashlaxkar/master

confict resolve