merged changes again ( previous commit was wrong )
merged changes again ( previous commit was wrong )

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