Submitted 3.0 to the app store. Merging back to master