protractor config and first test
added phantom
Merge branch 'master' into e2e

merging master into e2e