Velocity-XEX+ISO

xex+iso-branch

Merge remote-tracking branch 'refs/remotes/origin/ISO' into XEX

master28.10.2016

Compilation fixes

Velocity-ISO

Revert "Update to Qt5 and get working on OS X"

This reverts commit aa06d9222552d7a73ac236ad89925d8443d76cdf.

Velocity-XEX

xex-branch

Remove debug code

master_old-branch: Merge pull request #63 from Kuci/master

Multiple commits