Merge origin/master

Conflicts:
	src/User/Customer.java
Merge origin/master

Conflicts:
	src/User/Customer.java
Merge origin/b2012 into pbranch