working ui
Merge branch 'master' of https://github.com/conalytics/conalyticsdev

Conflicts:
	src/main/webapp/WEB-INF/spring-servlet.xml