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

Conflicts:
	app/src/main/java/ca/mixitmedia/weaver/Tools/WeaverVideoFragment.java