Merge pull request #662 from nZEDb/dev

Dev
Merge pull request #663 from nZEDb/dev

Dev
Merge pull request #664 from nZEDb/dev

Dev
Merge pull request #665 from nZEDb/dev

Change simple_php_yenc_decode check to a sub-string search to allow impr...
Merge pull request #666 from nZEDb/dev

Dev
Disable the description text if the argument is correctly set.

Disable description if the argument is correctly set.
Manualy update changelog and version.
Manualy update changelog and version.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into nZEDb-dev

Conflicts:
	nzedb/build/nZEDb.xml

merge conflict
Merge branch 'nZEDb-dev' into dev
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into nZEDb-dev

Conflicts:
	nzedb/build/nZEDb.xml

damn merge conflict
Merge branch 'nZEDb-dev' into dev
Fix the merge screw-up
Merge pull request #670 from nZEDb/dev

Multiple categorization changes / change to predbft
Merge pull request #671 from nZEDb/dev

Many changes (see Changelog)
Merge pull request #672 from nZEDb/dev

Add the reconnect on MySQL has gone away to exec/queryexec.
Updating Changelog.
Manually updating versions.
Update sqlpatch values in settings data file.
Merge pull request #673 from nZEDb/dev

Dev