Merge branch 'master' of github.com:gulbinas/willie-titanai

Conflicts:
	modules/redeploy.py
Merge branch 'master' of github.com:gulbinas/willie-titanai