Fix import typo
Merge branch 'master' of github.com:ethanal/Nimbus

Conflicts:
	nimbus/apps/api/views.py