partial update of activity objects
partial update of activity objects cont.
Merge remote-tracking branch 'origin/master'

Conflicts:
	OPENiapp/OPENiapp/APIS/resources.py