Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop

This commit is contained in:
Alexander Bock
2017-02-27 13:59:59 -05:00