New Atlas

Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	UI/MainScreen.cpp
#	android/assets/ui_atlas.zim
#	android/assets/ui_atlas_luna.meta
#	assets/ui_atlas.zim
#	assets/ui_atlas_luna.meta

UI/CwCheatScreen.cpp

@@ -335,8 +335,10 @@ bool CwCheatScreen::RebuildCheatFile(int index) {
 		return false;
 	}
 
-	for (const auto &line : lines) {
-		fs << line << '\n';
+	for (int i = 0; i < lines.size(); ++i) {
+		fs << lines[i];
+		if (i != lines.size()-1)
+			fs << '\n';
 	}
 	fs.close();