Refactoring Group Activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pariveda/obj/Debug/res/menu/main_activity_actions.xml