Modify
Merge branch 'develop' of github.com:ducdigital/Size42 into develop

Conflicts:
	startup.sh
Merge branch 'develop' of github.com:ducdigital/Size42 into develop
mondora-asteroid update
Merge branch 'develop' of github.com:ducdigital/Size42 into develop

Conflicts:
	startup.sh