added some inline comments
Merge branch 'develop' of github.com:gxa/gxa into develop