user edit/create , profile edit pages updated, new fields added, image upload added
Merge branch 'master' of https://github.com/mcany/VoloCalendar

Conflicts:
	.idea/workspace.xml
	web/resources/angular-app.js