Trying to fix the search box back to previous state
Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav

Conflicts:
	android/.metadata/.plugins/org.eclipse.core.resources/.projects/SMU_Nav_Android/org.eclipse.jdt.core/state.dat
	android/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
	android/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	android/.metadata/.plugins/org.eclipse.core.resources/.root/4.tree
	android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	js/main.js