Move templates dir
Merge branch 'qa' into develop_management_pools

Conflicts:
	CadVlan/Pool/views.py
	CadVlan/templates/pool/include_vip_js.js
Add news modules settings
Merge branch 'qa' into develop_refactoring