setup for disable editing on select2
resolve conflicts
Merge branch 'develop' of github.com:DanielReid/addis-core into develop

Conflicts:
	src/main/webapp/resources/app/js/controllers/analysisController.js
	src/main/webapp/resources/app/views/analysis.html
add $window info to analysisControllerSpec to fix tests
fix alignment in project view