Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	org.qbic.genomeviewer.portlet.iml
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/genome-viewer.js
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/genome-viewer.min.js
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/gv-config.js
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/index.html
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/styles/css/style.css
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/vendor/jquery.min.js
	web/VAADIN/org.qbic.genomeviewer/1.0.0/genome-viewer/vendor/jquery.min.map
	web/WEB-INF/web.xml
	web/index.jsp