comit for merge
Merge remote-tracking branch 'origin/master'

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