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

Conflicts:
	touchtracerFilosofyFelipe.py