Fixed argument number problem (requiring only the request now).
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev

Conflicts:
	aurora/manager/manager.py