Revert "Various implementation and stability patches"
Merge pull request #60 from Zentyal/revert-55-kamenim/zen-master

Revert "Various implementation and stability patches"