Merge branch 'master' of https://github.com/cokepluscarbon/webapp

Conflicts:
	src/main/webapp/WEB-INF/views/extjs/index.jsp
fix