changes related to Drop down issue and issue from our side
Merge branch 'master' of https://github.com/befreeit/devbefree

Conflicts:
	admin/dbclass/client_content_class.php