Features module added
Merge branch 'master' of http://github.com/gcba/educacion