add User Model
충돌 해결
Merge branch 'master' of https://github.com/jaeronge/deploy_manager

Conflicts:
	.target/ApplicationTest.class
	.target/IntegrationTest$1.class
	.target/IntegrationTest.class
	.target/controllers/Application.class
	.target/views/index.scala.html
	app/controllers/Application.java
	conf/application.conf
	conf/evolutions/default/1.sql
	project/Build.scala