Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	FinancialApp/build/classes/framework/FinancialApp.class
	FinancialApp/build/classes/framework/view/DefaultAccountForm.class

	FinancialApp/build/classes/framework/view/FrameworkMainForm$SymAction.class
	FinancialApp/build/classes/framework/view/FrameworkMainForm.class
	FinancialApp/build/classes/framework/view/MainForm$SymAction.class
	FinancialApp/build/classes/framework/view/MainForm$SymWindow.class
	FinancialApp/build/classes/framework/view/MainForm.class
	FinancialApp/nbproject/private/private.properties
	FinancialApp/nbproject/private/private.xml
	FinancialApp/nbproject/project.properties
	FinancialApp/src/creditcard/models/CreditCardCustomer.java
	FinancialApp/src/framework/Customer.java
	FinancialApp/src/framework/factory/Factory.java
	FinancialApp/src/framework/observer/Observer.java