Merge origin/master

Conflicts:
	AM/ajax/dashboard.php
	AM/js/dashboard.js