Making grip upgradable
Merge branch 'master' of https://github.com/softwarepsychology/MeetingRegistrationWeb

Conflicts:
	MeetingRegistrationWeb/app/view/Admin.js
some code formatting