Merge branch 'develop_management_pools' into develop_issue8

Conflicts:
	CadVlan/Pool/views.py
Merge branch 'develop_issue8' into qa

Conflicts:
	CadVlan/Pool/views.py