Fixes after moving MacOS project to Qt4.8.5
Merge branch 'development' of https://github.com/dava/dava.framework into development