Conflicts:
	annotation/src/main/java/lcsb/mapviewer/annotation/cache/XmlSerializer.java
	annotation/src/main/java/lcsb/mapviewer/annotation/services/MeSHParser.java
	pathvisio/testFiles/wikipathways/gstp.gpml
	web/src/main/webapp/resources/js/Functions.js