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

Conflicts:
	main.py