add management
Merge branch 'master' of https://github.com/zhangbobell/reportv2

Conflicts:
	application/controllers/price.php
	application/core/my_model.php
	application/models/mprice.php
	public/js/price/init_screen.js