added misc/testing/DB/convert_to_tpg_alt.php until ThePeeps can fix his script
uncommented truncate
Merge branch 'dev' of https://github.com/Bart39/nZEDb into Bart39-dev

Conflicts:
	Changelog
added "Usenet Index Post 1389796935 yEnc (01/01)" as nzb post, best used with GrabNZBs
added kill command for ffmpeg and mediainfo, set at 60 sec
added color to nntpproxy output
added CAT_PC_ISO to Category.php, basic check for now, looking only for \biso\b
removed "Usenet Index Post 1389796935 yEnc (01/01)" until I can check it better
Adding closing tag to file.
Fixing typo in AniDb output message.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Adding changelog entry, doh!!
fixed link in alpha->login.tpl
added script show_table_sizes.php to show data, index, free space used in all tables, changed regex for predb matching, now matches all but ~465k predb titles
added predb.tpl change posted by mordor, fixed bug in change_USP_provider.php
added full text search to site search, works only if you have these indexes - ix_releases_searchname_ft and/or ix_releases_name_ft
if you search on releases.name - ix_releases_name_ft is required
if you search on releases.searchname - ix_releases_searchname_ft is required
as posted in the forum, ^& do not work with this search
added explanation for useful operators when using full text searches
maybe fix for search removing +
another try to fix ft search
add CouchPotato url/api to site=edit, fixed link 'Send to CouchPotato'
added CouchPotato API to all themes
possible fix to safe scripts putting excessive parts into part repair
moved couchpotato to user, instead of site