Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
	Code/FriendFinderApplication/res/layout/activity_group_list.xml
ok