retrofit from upstream
Merge branch 'master' of https://github.com/faridlab/neph into faridlab-master

Conflicts:
	config.php
	core/loader.php
	core/router.php
	sites/ROOT/config/config.php
	sites/ROOT/modules/home/views/index.php
	sites/ROOT/start.php