Up to date version file
Merge branch 'master' of https://github.com/google/physical-web

Conflicts:
	android/PhysicalWeb/app/version.properties
synced version file
Merge branch 'master' of https://github.com/google/physical-web
Merge branch 'master' of https://github.com/google/physical-web
Merge branch 'master' of https://github.com/google/physical-web
Added demo beacon functionality
Merge pull request #86 from matthewsibigtroth/beacon_demo

Beacon demo