wrote tests in my familySearchSpec.js for all my function in
familySearch.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/conf.js
	src/test/unit/jasmine/eventSpec.js