Addition of bookmark and history views, placeholder data, rigged almost all segues
Merge branch 'ross'