code update by rajib
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	include/functions_app_specific.php