Merge branch 'master' of https://github.com/sharonlin/elysium

Conflicts:
	public/js/components/reports/reports.html