Changes made by Ryan Braun (ryan.braun@knowledgelake.com).
Merge branch 'master' of https://github.com/srd8580/KLMobileSearch.git
Changes made by Ryan Braun (ryan.braun@knowledgelake.com).
Merge branch 'master' of https://github.com/srd8580/KLMobileSearch.git

Conflicts:
	KnowledgeLake Search Mobile/app/viewmodels/searchBuilderViewModel.js
	KnowledgeLake Search Mobile/app/views/resultsView.html