directive unit tests resolved with modiefing a node module
Merge branch 'origin/feature-addressbook-concept'

Conflicts:
	app/js/controller/contacts.js
	test/unit/test.main.js