fiixxx
Merge branch 'nguyennd_56' of https://github.com/nguyennd56/wifi-locator_group_6 into nguyennd_56

Conflicts:
	WiFi/bin/AndroidManifest.xml
fixx
fixxxxxxxx
fixxx
Merge branch 'nguyennd_56' of https://github.com/nguyennd56/wifi-locator_group_6 into nguyennd_56