old funds company name view & admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/templates/site/fonds.blade.php
	public/js/main.js
old funds company name view & admin