protractor & karma tests
Merge branch 'feature-tests' of https://github.com/mmai/ng-devstack into feature-tests

Conflicts:
	gulpfile.js