Solidified search and detect
Merge branch 'master' of https://github.com/TANguyen1893/DPMGroup3

Conflicts:
	Localizer.java
	Navigation.java