test
Merge branch 'master' of https://github.com/teotc/GroupConnectMain

Conflicts:
	GroupConnect/res/values/strings.xml