Merge origin/master

Conflicts:
	public_html/include/script/app-config.js
	public_html/include/script/controllers/beneficiaryDistController.js
	public_html/index.html
	public_html/views/templates/header.html
	public_html/views/templates/sidebar.html