Update .gitignore
Sync with server
Merge branch 'master' into hudbt

Conflicts:
	faqactions.php
	include/torrents_json.php
	js/common.js
	offers.php