- Combined unnecessarily-split lines

- Added error-handling for bluetooth-less devices (e.g. emulator)
- Added GET request code to Communicator

- Added minor error-handling to DrawerActivity in event of emulator
- Added dual-pane debug window (beacon list + json)
Moved permissions to correct location
Merge https://github.com/ritnorthstar/Minimap-Client into JsonCommunication

Conflicts:
	.gitignore
	Code/Minimap/src/main/java/com/northstar/minimap/DrawerActivity.java
	Code/Minimap/src/main/res/layout/activity_drawer.xml
- readded error-handling to bluetooth code

- added UI callback handling for JSON fetching
- corrected default and hint IP addresses for emulator
- decoupled API calls from main server IP
Removed all the junk that .gitignore was failing to ignore from the repo #pleasedontbreakthings
Style consistency fixes.
Merge pull request #6 from ritnorthstar/cc-json-communication

Style consistency fixes for PR #6
Merge pull request #5 from ritnorthstar/JsonCommunication

(JsonCommunication + Chris' fixes) -> master