make calls to ProductLoder consistent
moved protractor so e2e runner doesn't attempt to run them
Merge branch 'master' into e2e

merging latest from master
Fix merge conflicts and tests