Don't setup player instance in headless mode
Fix & streamline the gradlew startServer config.cfg generation - second JSON pass was overwriting the first pass
Merge branch 'develop' of github.com:MovingBlocks/Terasology into fix_1069