Add Procfile
Merge branch 'develop'

Conflicts:
	app/controllers/Application.scala
Merge branch 'master' of github.com:wayneyu/mer into wwy_develop