fixes
Merge branch 'master' of https://github.com/marcokeur/drw

Conflicts:
	controller/__init__.py
	controller/rule_engine/__init__.py