Merge pull request #18 from MarcoDeBortoli/feature/automation

Feature/automation
Refactored so all my existing Feature/Objects are working with Marco's merge
Merge branch 'feature/automation' of github.com:openeyes/OpenEyes into feature/automation
Ongoing merging and refactoring