updated
Merge remote-tracking branch 'origin/master'
changed ViewController Classes to work with the new Rest_service