android platform
Merge branch 'master' of https://github.com/aphalak/Partysculture

Conflicts:
	.idea/workspace.xml