Merge pull request #6 from manaweb/dev

Dev
Merge pull request #9 from manaweb/dev

Dev
Merge pull request #10 from manaweb/dev

Dev
Merge pull request #11 from manaweb/dev

Dev
Merge branch 'dev'
Merge https://github.com/manaweb/TerraNight into dev