Merge origin/master

Conflicts:
	public_html/include/script/controllers/beneficiaryDistController.js