Correcao pela octagesima vez
Merge branch 'dev' of https://github.com/manaweb/TerraNight into dev