removed conf file from git
worked on client feedback
Merge branch 'master' of https://github.com/parambsingh/nadpe

Conflicts:
	_core/modules/user/templates/admin/admin_inner.tpl.html