a:
Merge branch 'master' of github.com:markoilicni/usb_2

Conflicts:
	phpcode/application/controllers/admin/news.php