Bugfix
Merge branch 'origin/master'

Conflicts:
	app/controllers/ShortUrlController.scala