Updated code before welcoming gkista
Merge branch 'with_marinos' of https://github.com/agroknow/agrimoodle into with_marinos