Merge branch '0.4'

Conflicts:
	nosqlmap.py

Author: tcstool

nosqlmap.py

@@ -71,7 +71,7 @@ def mainMenu():
 		print "| |\  | (_) /\__/ /\ \/' / |____| |  | | (_| | |_) |"
 		print "\_| \_/\___/\____/  \_/\_\_____/\_|  |_/\__,_| .__/"
 		print "===================================================="
-		print "NoSQLMap-v0.4a-DEV"
+		print "NoSQLMap-v0.4a"
 		print "[email protected]"
 		print "\n"
 		print "1-Set options"