Working on the new activity form
Merge branch 'master' of https://github.com/geobalas/trafie