change in database. So new files added.
Merge branch 'master' of github.com:BEP-Project/Bachelor-Project-System

Conflicts:
	app/View/Companies/edit.ctp