Refactoring code
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	admin/ajax.php
	site/ajax.php
DRY