wire framing for questions and nav
Merge remote-tracking branch 'upstream/develop' into BRIDGE-90

Conflicts:
	src/main/webapp/WEB-INF/tags/layouts/main.tag
	src/main/webapp/WEB-INF/wro.xml
Merge pull request #109 from marcel-blonk/BRIDGE-90

wire framing for questions and nav