Jquery Cookie
custom gitignore idea
Merge branch 'master' into graphiqueRaphael

Conflicts:
	logged.xhtml
	login.xhtml