Merge branch 'phase1' of https://github.com/cirakas/ilids into phase1

Conflicts:
	src/main/webapp/WEB-INF/header.jsp