add userpic page
Merge branch 'master' of https://github.com/quentinR/picktr

Conflicts:
	Picktr/src/main/java/com/mti/picktr/presentation/PhotoController.java