Sidebar
Destination: Progress
Final
Merge branch 'Final'

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