Merge branch 'hung'

Conflicts:
	Gemfile
Merge branch 'hung'
template after log in
template after log in