Untracked params-local
Merge branch 'v1'

Conflicts:
	app/config/params-local.php
Backported HTML/CSS changes from future versions
Merge v1 into v2
Merge branch v2
Merge branch 'master' of https://github.com/mirkoadari/lr-demo-answers-php