Merge remote-tracking branch 'origin/develop' into debian
prepare for new version
Merge remote-tracking branch 'leapcode/debian' into debian

Conflicts:
	debian/changelog