最終更新日及び最終IP
Merge branch 'feature/user-last-login'

Conflicts:
	app.rb