Data Model Integration.
What is going on here?
Merge branch 'Dante'

Conflicts:
	app/src/main/java/ca/mixitmedia/weaver/Tools/WeaverVideoFragment.java
Merge remote-tracking branch 'origin/Alex'

Conflicts:
	app/src/main/java/ca/mixitmedia/weaver/Tools/WeaverMapFragment.java
	app/src/main/java/ca/mixitmedia/weaver/Tools/WeaverVideoFragment.java
	app/src/main/java/ca/mixitmedia/weaver/WeaverActivity.java
Untested Alex Merge
Merge branch 'Alex'
Data Model Merge.
Data Model Merge.
glitch X2 combo
NFC intent registered.