Company Implementation
Moved persistence.xml file
Fixed Company implementation
Updated templates
Moved headers/footers to WEB-INF directory
Updated to latest bootstrap version
Added missing bootstrap files
Updated main servlets
Added "add computer" template
Merge pull request #1 from heffebaycay/feature-company

Merged Company feature into develop
Fixed CSS path issue
Implemented Computer List
Updated SQL 2 file and computers_list jsp
Introduced Computer Search feature
Added computer list length to the output
Added search feature for companies
Fixed links in company/computers list and header
Added a redirection from the index.jsp file to the Computer list
Merge pull request #2 from heffebaycay/feature-search

Search feature
Started work on add feature
Merge branch 'feature-add' into develop

Conflicts:
	src/fr/epf/computer/service/ComputerService.java
Implemented Add Company feature
Added findById method for Companies
More work on add computer feature
Merge pull request #4 from heffebaycay/feature-add-company

Add company feature
Merge pull request #5 from heffebaycay/feature-add

Add Computer feature