First commit of 3.1, using Fragments

Fragment version to circumvent the issues with separate Activities.
Still fails on compile, layout inflater issues