Merge branch 'master' into develop
introduced promises to imageview
minor cleanup
minor cleanup
fixed mouse wheel issue
Merge branch 'webworker' into develop