Lol
Merge branch 'master' of https://github.com/fatkhank/ppla03

Conflicts:
	android/src/com/ppla03/collapaint/ui/Dashboard.java