test clear
Merge branch 'master' of https://github.com/prock13/Peru-MobileApp

Conflicts:
	viewModels/appViewModel.js