Merge origin/master

Conflicts:
	exiastore/admin/src/model/dao/DataBaseDAO.class.php
Merge origin/master