#393 progress; token
Merge branch 'Sprint3' into wip_oauth

Conflicts:
	src/main/java/com/blstream/myhoard/controller/MyHoardErrorHandler.java
#393 authorization
global format