Fixed hanging ngdocs task
Should not be in here!!
Cleaned up tests
Fixed protractor version problem
Force usage of minijasminenode@0.4.0
Merge remote-tracking branch 'origin/master' into spProperty

Conflicts:
	src/sp/i18n/spProperty.js