Vasilian kos9k
Merge branch 'dev'

Conflicts:
	protected/migrations/m140324_142828_add_column_kp.php
Edit migration
Merge branch 'dev'

Conflicts:
	protected/migrations/m140324_142828_add_column_kp.php