Yoni is awesome
Merge branch 'master' of https://github.com/meet-projects/sweetdreams-yl1-2014

Conflicts:
	buttonclass.pyc
	imagesclass.pyc
	labels.py
	labels.pyc