Merge in Android 4.1 branch and add in iOS 7 support

Also did a code tidy up as well. Unsure whether you wanted to increment the release date or not.