Removed unneeded graphics
fixed rf flashing
tiny changes
refactoring
Merge remote-tracking branch 'origin/master' into Alex

Conflicts:
	app/src/main/java/ca/mixitmedia/weaver/Tools/WeaverVideoFragment.java
progress
Got NFC working
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