merged changes
config.coffee now contains serverUrl
merged last version