Merge origin/master

Conflicts:
	application/controllers/change_form.php
Merge origin/master