jklhg
adapted js/vendor dir
Merge branch 'bugfix/moved-bootstrap-js' into develop

Conflicts:
	grails-app/views/layouts/main.gsp