US16 Reserve
Merge branch 'master' of https://github.com/tellesnobrega/nova

Conflicts:
	nova/tests/test_quota.py