Merge pull request #12 from Garfonso/master

changed system that decides if upsync is allowed or not.
cleaned up whitespaces in db-config files
added missing contactset permissions file