fixes for conflict disableing
Conflict disableing works with db storage
updated to newest jetty 8.1.16 and ical 1.0.6
moved urlencryption to main trunk
update to gwt 2.7.0 api. made auth token static