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

Conflicts:
	WiFi/bin/classes/com/example/wifilocator_rebuild/SignalsActivity.class
	WiFi/bin/classes/com/example/wifilocator_rebuild/module/Signal.class
	WiFi/src/com/example/wifilocator/activity/SignalsActivity.java
	WiFi/src/com/example/wifilocator/module/Signal.java
Merge branch 'nguyennd_56' of https://github.com/nguyennd56/wifi-locator_group_6 into nguyennd_56