Conflicts:
	annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java
	web/src/main/webapp/resources/js/AliasInfoWindow.js
	web/src/main/webapp/resources/js/LayoutAlias.js