fixes
Merge branch 'release/1.0.1' into develop

Conflicts:
	base/JudoNetworking.iml
	observers/observers.iml