Merge branch 'development'
Merge branch 'development'
Merge branch 'development' of github.com:charlesveasey/vDome into development
Fix linux compile errors