implement user avatar
Merge branch 'master' of https://github.com/nforge/nforge4

Conflicts:
	app/controllers/UserApp.java