merged changes with windows side
merged changes with windows side

jonntd/oyprojectmanager,dshlai/oyprojectmanager,code-google-com/oyprojectmanager,code-google-com/oyprojectmanager,jonntd/oyprojectmanager