Dev merge

Some fixes to adhere to Jeremy's changes on the master branch:
 * `cloud_settings` method on MainWindow was renamed to `cloudSettings`
 * Topolgy does not accept setting the project type value directly anymore, now it reads it from project settings instead  
 * field `resources_type` inside Topology file was renamed to `project_type`
 * default value for `project_type` field is now `local` instead of `None`