Lollipop Lollipop, Oh Lolli Lolli Lolli
Merge branch 'lollipop' into menuAdminLollipop

Conflicts:
	mobile/src/main/java/com/truckmuncher/truckmuncher/vendor/VendorHomeActivity.java
Ui elements updated
Support fragments so backstack works
Fastscroll thumb styling
Blind copy/paste. Whoops. Fix Travis
Merge branch 'lollipop' into menuAdminLollipop
Merge pull request #19 from TruckMuncher/menuAdminLollipop

Menu admin lollipop
Version bump for new sprint
Lollipop Lollipop, Oh Lolli Lolli Lolli
Ui elements updated
Support fragments so backstack works
Fastscroll thumb styling
Blind copy/paste. Whoops. Fix Travis
Version bump for new sprint
Lot's of tests and bug fixes
Merge branch 'master' into menuAdmin

Conflicts:
	mobile/src/main/java/com/truckmuncher/truckmuncher/vendor/menuadmin/MenuAdminFragment.java