Maybe fix the svn repo
Maybe fix the svn repo
Merge svn with master
Merge svn with master
Maybe fix the dev-branch
Maybe fix the dev-branch
Merge dev-branch with master
Merge dev-branch with master
Maybe fix master.
Maybe fix master.
Maybe fix the svn repo
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 branch 'svn' of github.com:mastacontrola/fogproject into svn

Conflicts:
	packages/web/commons/system.php
	packages/web/management/js/fog.login.js
Maybe fix the svn repo
Maybe fix the svn repo
Merge svn with dev-branch
Merge svn with dev-branch
Merge master with svn
Merge master with svn