Merge origin/master

Conflicts:
	modules/app/controller/index.php
	modules/app/views/index/index.phtml
	modules/app/views/layouts/basic.phtml
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	modules/app/controller/index.php
	modules/app/views/index/index.phtml
	modules/app/views/layouts/basic.phtml
	nbproject/project.properties
	nbproject/project.xml