ui modified
set type in customer and account
fixed conflict
Merge branch 'master' of github.com:ajay12/FinanceApplication

Conflicts:
	FinanceCompany/src/FInanceFramework/controller/FinanceController.java
	FinanceCompany/src/FInanceFramework/implementation/DefaultFinanceFactory.java