Marge Develop into Master

This has the new Swift implementation as well as the old Objective-C one. The server class has been fully implemented but the Store class has not.