Fix tests. Fix deployer configuration. Fix error messages loading.
Merge remote-tracking branch 'upstream/master'
Merge pull request #102 from dejan-brkic/master

Fix server build