changed unit tests.  fixed null return in service object
Merge branch 'develop' of github.com:appdevdesigns/appdevjs into develop

Conflicts:
	modules/site/web/pages/unitTests/tests/site_labels_test_mocha.js