Merge Develop Into Master

Now that the android app is working I think it is a good idea to push master forward