Feedfilms project with 3 new layouts
Crud Albums
Crud Albums
Merge branch 'master' of https://github.com/agustincl/feedfilms
Database changed
Remove error log
Merge branch 'master' of https://github.com/antonov/feedfilms

Conflicts:
	.buildpath
	.project
	.settings/org.eclipse.php.core.prefs
	application/Bootstrap.php
	application/configs/application.ini
	application/controllers/AuthorController.php
	application/controllers/BackendController.php
	application/controllers/ErrorController.php
	application/controllers/IndexController.php
	application/layouts/scripts/backend.phtml
	application/layouts/scripts/layout.phtml
	application/views/scripts/author/login.phtml
	application/views/scripts/error/error.phtml
	application/views/scripts/index/index.phtml
	public/.htaccess
	public/index.php
	tests/phpunit.xml
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	.settings/org.eclipse.php.core.prefs
	application/configs/application.ini
	application/layouts/scripts/backend.phtml
	application/views/scripts/index/index.phtml
	feedfilms.error-log.log
	public/.htaccess
Merge branch 'master' of https://github.com/antonov/feedfilms

Conflicts:
	application/controllers/IndexController.php
	application/layouts/scripts/layout.phtml
Merge remote-tracking branch 'remotes/upstream/master'
Starting datamapper
Festivals Mapper
Merge branch 'master' of https://github.com/agustincl/feedfilms
User login
Forms
Merge pull request #19 from grisendo/master

Festivals mapper
Merge pull request #20 from antonov/master

User login
Merge
Login form with recapthcha
Adios lo mio