Merge branch '0.4'

Conflicts:
	nosqlmap.py