added caching for company and employee
Merge branch 'master' of github.com:rmagnum2002/crm

Conflicts:
	app/views/layouts/application.html.erb