Changes made by Steve Danner (steve.danner@knowledgelake.com).
Merge branch 'master' of https://github.com/srd8580/KLMobileSearch.git

Conflicts:
	KnowledgeLake Search Mobile/app/init.test.js
	KnowledgeLake Search Mobile/app/unitTests/unitTestSettings.js