Crud Albums
Crud Albums
Merge branch 'master' of https://github.com/agustincl/feedfilms
Forms
Adios lo mio
Merging
Mergin fixed
Merge branch 'master' of https://github.com/agustincl/feedfilms
Fix Merging
Merge branch 'master' of https://github.com/agustincl/feedfilms
Module Comments
Module Comments
Module Comments v2
Module Comments Fixed
Navigation xml
Merge pull request #25 from alexis1704/master

Module Comments
merge
Database dump
Merge branch 'master' of https://github.com/agustincl/feedfilms

Conflicts:
	application/views/scripts/author/login.phtml
	application/views/scripts/forms/_element_form.phtml