categories
categories
fix google analytics
general changes
Merge branch 'ui' of https://github.com/devstarter/ii

Conflicts:
	src/main/webapp/new/index.html
	src/main/webapp/new/js/app.js
paragraphs