Refined current apps and started work on Skills and Badges.
Merge remote-tracking branch 'origin/UserProfileGroupsEventsSearch'

Conflicts:
	xapps/userprofile/models.py