Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	composer.json
	composer.lock
	config/application.config.php
Changes in interface
Merge pull request #9 from boleal/master

Entities
configurations Updated
Global and local config updated
Merge
application.config fixed
views and lyout fixed
Merge branch 'master' of https://github.com/boleal/wpzf2

Conflicts:
	composer.json
	composer.lock
	config/application.config.php
Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	composer.json
	config/autoload/local.php
	module/Album/config/menu.config.php
	module/Application/config/menu.config.php