moved couchpotato to user, instead of site
Updating Changelog, forgot again!
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

* 'dev' of github.com:nZEDb/nZEDb:
  Updating Changelog, forgot again!
  Updating text on one message and adding two tests for the NZB directory.
  possible fix to safe scripts putting excessive parts into part repair
  added CouchPotato API to all themes
  add CouchPotato url/api to site=edit, fixed link 'Send to CouchPotato'
  another try to fix ft search
  maybe fix for search removing +
  added explanation for useful operators when using full text searches
  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
  fixed link in alpha->login.tpl
  Adding changelog entry, doh!!
  Fixing typo in AniDb output message.
  Adding closing tag to file.
  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
  added color to nntpproxy output
  added kill command for ffmpeg and mediainfo, set at 60 sec
  added "Usenet Index Post 1389796935 yEnc (01/01)" as nzb post, best used with GrabNZBs
  uncommented truncate
  added misc/testing/DB/convert_to_tpg_alt.php until ThePeeps can fix his script
  fixed renametopre
Merge branch 'dev' into custom

* dev:
  Updating Changelog, forgot again!
if CouchPotato not set, don't show
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
fixed couchpotato integration on alpha theme
added a.b.games.dox to byGroup in category
added more audio regexes to namecleaning
code alignment
Merge pull request #1123 from Bart39/dev

fixed couchpotato integration on alpha theme
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

# By Bart39 (2) and jonnyboy (2)
# Via jonnyboy (2) and Bart39 (1)
* 'dev' of github.com:nZEDb/nZEDb:
  code alignment
  fixed couchpotato integration on alpha theme added a.b.games.dox to byGroup in category added more audio regexes to namecleaning
  if CouchPotato not set, don't show
  moved couchpotato to user, instead of site

Conflicts:
	www/pages/profileedit.php
Merge branch 'dev' into custom

# By Bart39 (2) and jonnyboy (2)
# Via jonnyboy (2) and others
* dev:
  code alignment
  fixed couchpotato integration on alpha theme added a.b.games.dox to byGroup in category added more audio regexes to namecleaning
  if CouchPotato not set, don't show
  moved couchpotato to user, instead of site