Forem Open Source Core

Merge Conflict

166: Disconnecting with a Feature Phone