Resolved conflict.
Merge branch 'develop' of github.com:Sanji-IO/sanji-examples into develop