admin
admin
admin
Merge branch 'master' of https://github.com/azizcode/spkpkli

Conflicts:
	protected/controllers/AdminController.php
	protected/runtime/application.log