Play 2.2 easy initial migration and easy fixes (still completely borked elsewhere.)
Merge latest dev changes
Trying to make AuthController actions async-friendly
More brokenness fixing, still lots to do
Got core module compiling (with warnings)
Got annotation and links modules compiling
App nominally compiling, tests not running yet.
Merged latest changes from master. App compiles but does not yet run.
Merged latest changes from master. App compiles but does not yet run.
Tests now compile but don't pass due to CSRF issues
Keep CSRF checking in tests (should work again in Play 2.2.1).
Bumb to 2.2-SNAPSHOT which fixes CSRF. Various tweaks to get CSRF
passing in tests:

- turned off signing in test conf
- adding nocheck header to all requests
First stage of major DAO/error handling refactor.

Since the 2.2 Result changes, its too complicated to handle DAO
errors using Either[Error,Result] because the maps and flatmaps required
to extract good results become horrible tangled amonst the futures. Now
the DAO throws exceptions which, in stage 2, should be
correctly intercepted and handled.

These changes remove a lot of quite gross code from the CRUD stuff.
Attempting to properly catch and handle DAO errors
Experimental test fixes.

Catching DAO exceptions in Global.onError means the exceptions are
still thrown in tests. We should try to find a solution that allows
consistent handling of this.
Playing around with error handling. Much work still needed.
Experimenting with action-composition based REST err handling
More experimental future-recovering syntax
Merge branch 'master' into dao_exceptions

Conflicts:
	modules/portal/app/controllers/Portal.scala
Update to 2.2.1-RC1 (and add mysterious sbt voodoo fix