test
Merge branch 'master' of https://github.com/18rulez/apps

Conflicts:
	android/.idea/workspace.xml