Data Model Integration.
Merge remote-tracking branch 'origin/master'

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

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