testing commit
Merge pull request #46 from mattrebor/dan

testing commit
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
chui

Conflicts:
	src/main/webapp/WEB-INF/views/header.jspx