Edit uploader
Merge remote-tracking branch 'origin/dev' into dev
Add v96 kp for email and print
Add v111 for print and email
Price min and add collum to DB
Edit v111 KP. Price min echo
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	protected/controllers/GetkpController.php