bugfix
Merge branch 'feature/transactions' of github.com:openeyes/OpenEyes into feature/transactions