// version compliancy
Merge branch 'dev'

Conflicts:
	productscategory.php
//Version update