Bare changes blue.
Merge branch 'master' of https://github.com/elgrom/slap-me

Conflicts:
	android/src/hackathon/slapme/main/MainActivity.java