Merge branch 'master' of https://github.com/GoogleJump/returnJump
Fix FAB in shopping cart activity
Merge branch 'master' into rebase-master