added
Merge branch 'release-0000000' into issue-00000072_local_protractor

Conflicts:
	Gruntfile.js
seemed to fix webdriver problem
added stuff
Merge branch 'release-0000000' into issue-00000072_local_protractor
Merge branch 'release-0000000' into issue-00000072_local_protractor
delint
Merge pull request #101 from bitterheart/issue-00000072_local_protractor

Issue 00000072 local protractor