cookie changes
Merge branch 'firstpullSat'

Conflicts:
	group1-sprint2/src/main/webapp/js/main.js
uplaod page