Нов начин за ценови политики (beta)
Merge branch 'dev' of github.com:bgerp/bgerp into dev

Conflicts:
	price/Lists.class.php