Commit
Merge branch 'master' of https://github.com/Olocode-dev/droidApp.git

Conflicts:
	.idea/workspace.xml