Minor fixes for Ubuntu 14.04, also bugfix in templates caused by refactoring of siox-skeleton-builder.py.
git pushMerge branch 'master' of ssh://github.com/JulianKunkel/siox