ANTARCTICLE-276 instance name added into Application
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ArticleController.scala
	app/controllers/UserController.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ArticleController.scala
	app/controllers/UserController.scala