Merge branch 'release/0.5' into develop
moved inline styling into css file
Merge branch 'develop' into feature/better-css

Conflicts:
	src/main/webapp/index.jsp
better state transitions
Merge branch 'feature/better-css' into develop
0.5 -> 0.6
Merge branch 'release/0.6'