Update to header.jsp
Merge branch 'master' of heroku.com:cloudsole-data

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