a
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/filters.php