Merge pull request #1 from Lora-net/develop

Rebase to head develop branch

Author: abouillot

.gitignore

@@ -1,20 +1,19 @@
-lst/
-obj/
-bin/
-*.dep
-*.uvgui.*
-*.uvgui_*.bak
-*.uvguix.*
-*.uvguix_*.bak
-*.uvoptx
-*_uvopt.bak
-*_uvoptx.bak
-*_uvproj.bak
-*_uvprojx.bak
-*.ctx
-*.dbi
-*.xdb
-*.svn
-*.pbxproj
-*.cogui
+lst/
+obj/
+bin/
+*.dep
+*.uvgui.*
+*.uvgui_*.bak
+*.uvguix.*
+*.uvguix_*.bak
+*_uvopt.bak
+*_uvoptx.bak
+*_uvproj.bak
+*_uvprojx.bak
+*.ctx
+*.dbi
+*.xdb
+*.svn
+*.pbxproj
+*.cogui
 *.comarker