test commit

test commit
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team1

Conflicts:
	Source/src/main/webapp/pages/index.jsp
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team1
added footer and header

added standard footer and header to the project