Service refactored to use a boolean stored in the application object to indicate whether the hotspot service is running or not. Tests updated appropriately
Resolved merge conflicts