More docs and formatting
Merge remote-tracking branch 'github/master'

Conflicts:
	src/cableferret/main/MainActivityLogic.java