cx
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git
into dev

Conflicts:
	src/icons/administrator.png
	src/icons/arrow_left.png
	src/icons/gear.png
	src/icons/spreadsheet.png
	src/icons/stats_lines.png
	src/icons/trash_can.png
	src/icons/upload.png
	src/icons/zoom.png