Functionality for consumer setting & popups
Nomral changes
Merge branch 'Development-1' of https://github.com/PLUMDM/AdviseMeOnline into Development-1

Conflicts:
	public/view/admin_index.php