Maybe fix the svn repo
Merge svn with master
Maybe fix the dev-branch
Merge dev-branch with master
Maybe fix master.
Maybe fix the svn repo
Merge branch 'svn' of github.com:mastacontrola/fogproject into svn

Conflicts:
	packages/web/commons/system.php
	packages/web/management/js/fog.login.js
Merge svn with dev-branch
Merge master with svn
Merge master with dev-branch
Fix issue in PrinterManager.php service file.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2499 71f96598-fa45-0410-b640-bcd6f8691b32
Maybe fix the svn repo
Merge svn with dev-branch
Merge master with svn
Merge master with dev-branch
Don't make snapins require a storage group unless being updated from GUI.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2500 71f96598-fa45-0410-b640-bcd6f8691b32
Maybe fix the svn repo
Merge svn with dev-branch
Merge master with svn
Merge master with dev-branch