some work on the different views
Merge branch 'development' of https://github.com/pse4/orange-proton into development

Conflicts:
	app/assets/javascripts/orangeproton.mindmap.js

	modified:   app/assets/javascripts/orangeproton.admin.js
	modified:   app/assets/javascripts/orangeproton.mindmap.js
	modified:   app/assets/javascripts/orangeproton.search.js
	modified:   app/assets/javascripts/orangeproton.trail.js
	modified:   app/assets/javascripts/request.js