Merge origin/master

Conflicts:
	.gitignore
	Customers2/nbproject/project.properties
	Customers2/src/java/controller/FrontController.java
	Customers2/src/java/model/Customer.java
	Customers2/src/java/model/CustomerDB.java
	Customers2/src/java/view/Add.java
Merge origin/master

Conflicts:
	.gitignore
	Customers2/nbproject/project.properties
	Customers2/src/java/controller/FrontController.java
	Customers2/src/java/model/Customer.java
	Customers2/src/java/model/CustomerDB.java
	Customers2/src/java/view/Add.java