small updates on resources
Merge branch 'master' of https://github.com/OPENi-ict/api-framework

Conflicts:
	OPENiapp/OPENiapp/APIS/Activity/Event/Resources.py
	OPENiapp/OPENiapp/APIS/Location/Event/Resources.py
	OPENiapp/OPENiapp/APIS/urls.py