Merge pull request #33 from ancafarcas/master

settings changed due to syncronization to superdesk