modified
jquery
Merge branch 'master' of github.com:pscheit/psc-cms-client

Conflicts:
	www/bootstrap/css/bootstrap-responsive.css
	www/js/jquery-1.9.1.min.js
design