server update
Merge branch 'master' of https://github.com/kgawne/P2PCalendar