testing changes
Merge branch 'master' of http://github.com/maxRicardo/Daedalus

Conflicts:
	daedalus/lib/utils.py