remove conflict file
Make announce use class files to obtain needed infos.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2224 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
More fixes to class based.  Actually reports uploaded/downloaded stats too.  Seems to update time correctly as well.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2225 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Forgot to tell the hookmanager to use the proper function.  This should correct for that.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2226 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Merge svn with master
Fix menu system so it actually.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2227 71f96598-fa45-0410-b640-bcd6f8691b32
Fix weird css issue with kill button checked.  Was calling .../images/kill.png but should've been calling ../images/kill.png.  Fix snapin deploys to only deploy if snapins are associated to a host.  Snapin tasks will not deploy if there are no snapins associated.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2228 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Add values for max peers, timeout, minimal interval, interval, the torrent directory, and the tasking.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2229 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Use the fogcore new functions and db settings where appropriate for the announce.php

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2230 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Fix torrent task to include down type.  Move torrent checkin to mc_checkin rather than Pre_Stage1.php.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2231 71f96598-fa45-0410-b640-bcd6f8691b32
Fix bootmenu.class.php to use imagingTasks.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2232 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master
Merge branch 'dev-branch' of https://github.com/mastacontrola/fogproject into torrent-casting
torrent-casting should use mc_checkin instead of Pre_Stage1