plusOne note ok
merge
Merge branch 'master' of https://github.com/quentinR/picktr

Conflicts:
	Picktr/src/main/webapp/userpics.xhtml