Show up button if in child fragment
Merge pull request #122 from schilit/UriBeacon-Builder

Update UriBeacon library with ADV packet builder.
Wow, great update. LGTM. Merging.
Merge pull request #120 from matthewsibigtroth/add_action_bar_up_button

Show up button if in child fragment
Merge branch 'master' of https://github.com/google/physical-web
Merge branch 'master' of https://github.com/schilit/physical-web into Cleanup

Conflicts:

android/PhysicalWeb/app/src/main/java/physical_web/org/physicalweb/Beaco
nConfigFragment.java