Tidy up and move one file to nZEDb_LIBS
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
	_build/nZEDb.xml
Manual updating of versions file
Update the guide to reflect the changes to the PPA

Ondřej Surý has added support for ubuntu 13.10 and 14.04 in his PPA for PHP5
Mediainfo is now latest in ubuntu 13.10
The smarty folder has moved, so updating the path.
Remove pdo_notes, phpdoc to nntp.php.
tweaking some scripts
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	_build/nZEDb.xml
Combined doConnect and doConnect_a.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into nZEDb-dev

Conflicts:
	misc/update/requestid.php

merge