Last changes for app with real backend to work
Merge remote-tracking branch 'origin/jas-29' into jas-29

Conflicts:
	schedule/schedule-appengine/src/test/java/com/jasify/schedule/appengine/http/servlet/UserServletTest.java