change to protractor version "0.18.1" - to fix a timeout error with firefox.
cleanup - protractor.config.js
Merge branch 'master' into functional-tests
Merge branch 'master' into functional-tests
updating test to run method-optionals on sauce labs,
Merge branch 'master' into functional-tests

Conflicts:
	scenario/support/protractor.conf.js
cleanup -
Merge pull request #189 from mulesoft/functional-tests

Functional tests