Create viewpager for main activity
Merge branch 'master' into teameditor
Start work on w/r table