commit home 20141009@1925
Merge branch 'master' of github.com:flightcom/tuningfork

Conflicts:
	tuningfork/application/controllers/admin/instruments.php
	tuningfork/application/views/admin/instruments/liste.php
	tuningfork/public/css/style.css
	tuningfork/public/css/style.less
	tuningfork/public/js/app-admin.js