Merge svn with dev-branch
Ignore time for replication to occur?

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