Added the buses and stops conventions.
Merge branch 'master' of github.com:webmasteractivogroup/transporteactivo