Merge branch 'master' of github.com:mastacontrola/fogproject
git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2128 71f96598-fa45-0410-b640-bcd6f8691b32
git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2129 71f96598-fa45-0410-b640-bcd6f8691b32
Merge branch 'master' of github.com:mastacontrola/fogproject
Remove head from comile.cmd
Revert SVN to 2128 revision

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2130 71f96598-fa45-0410-b640-bcd6f8691b32
Remove the .TMP file.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2131 71f96598-fa45-0410-b640-bcd6f8691b32
Revert to 2127

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2132 71f96598-fa45-0410-b640-bcd6f8691b32
Re-add the initrd= kernel argument parameter.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2133 71f96598-fa45-0410-b640-bcd6f8691b32
Update to latest pull of ipxe files.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2134 71f96598-fa45-0410-b640-bcd6f8691b32
Update the krn file.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2135 71f96598-fa45-0410-b640-bcd6f8691b32
Update the ipxe source to be more inclusive.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2136 71f96598-fa45-0410-b640-bcd6f8691b32
Update ipxe files to latest pull.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2137 71f96598-fa45-0410-b640-bcd6f8691b32
Make the installer remove 'FOG Service' service, and rename the 'FOG Service' folder to 'FOGService'
Remove legacy installation prior to installing new format
Merge commit 'c731f9c7cc05a7f0d0b50fc480093afc5f1c1755'

Conflicts:
	packages/tftp/ipxe.kkpxe
	packages/tftp/ipxe.kpxe
	packages/tftp/ipxe.pxe
	packages/tftp/undionly.kkpxe
	packages/tftp/undionly.kpxe
	packages/tftp/undionly.pxe
	packages/web/commons/system.php
Merge pull request #2 from mastacontrola/master

8/01/2014
fixed usertracking
Test commit for svn sync
test better git implementation.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2138 71f96598-fa45-0410-b640-bcd6f8691b32