change require
Merge branch 'master' of git@github.com:newicon/nii-template.git

Conflicts:
	htdocs/index.php
remove password from local db config
Cleaning up nii themes, restore to default
updating theme files