Merge remote-tracking branch 'upstream/master' into dev
Copied mousemine jsps over existing intermine jsps
removed .js file from incorrect dir
copied another mm over written file
Merge branch 'dev' of github.com:intermine/intermine into dev
Merge remote-tracking branch 'origin/dev'

Conflicts:
	bio/webapp/resources/webapp/model/gbrowseDisplayer.jsp
	intermine/webapp/main/resources/webapp/dataCategories.jsp
	intermine/webapp/main/resources/webapp/headMenu.jsp
	intermine/webapp/main/resources/webapp/reportHeaderInlineLists.jsp