updated
Merge branch 'develop' of https://github.com/always-on/always into
develop

Conflicts:
	core/discoRT/lib/disco1.6.10/src.zip
update