no message
Merge branch 'develop' of https://github.com/maxjbv/kivy-CM-2014 into develop

Conflicts:
	main.py
Merge commit 'aaafe3272795ab4630dde6f3b80d6a923fcc5203' into develop

Conflicts:
	main.py