logo option
Merge branch 'master' of github.com:simone-campagna/rubik

Conflicts:
	lib/python/rubik/conf.py
	rubik