Play 2.1 Migration: Modified files.
Play 2.1 Migration continued
renamed favicon
Play 2.1 Migration continued
Added License
Bumped version
Merge commit 'bff295549c01445d6008c12fc08f577e9919b2a9'

* commit 'bff295549c01445d6008c12fc08f577e9919b2a9':
  Bumped version
  Added License
  Play 2.1 Migration continued
  renamed favicon
  Play 2.1 Migration continued
  Play 2.1 Migration: Modified files.

Conflicts:
	project/plugins.sbt
Upgraded to Play 2.2.1