Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	protected/controllers/GetkpController.php
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	protected/controllers/GetkpController.php
KP v78
Merge remote-tracking branch 'origin/dev' into dev