Merge branch '0.4'

Conflicts:
	nosqlmap.py

Author: tcstool

.gitignore

@@ -213,3 +213,9 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+*.xml
+
+.idea/.name
+
+.idea/NoSQLMap.iml

README.md

@@ -1,7 +1,7 @@
 NoSQLMap 
 ========
 
-[NoSQLMap](http://www.nosqlmap.net) v0.3
+[NoSQLMap](http://www.nosqlmap.net) v0.4
 
 Introduction
 ============