Merge if already released

If you have already released the new app we can merge this into develop and go forward from there.