update
update
Merge branch 'master' of https://github.com/Glassbox-Projects/Development.git

Conflicts:
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/Webinvoice.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/Alert$1.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/Alert.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/SignUpView.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/ViewController.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/DTOFactory.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/UserServiceImpl.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/UserValidator.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/DTOentity/StateDTO.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/entity/Address.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/entity/State.class

`lex/src/com/glassbox/webinvoice/shared/entity/Address.java
Merge branch 'master' of https://github.com/Glassbox-Projects/Development.git

Conflicts:
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/Webinvoice.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/Alert$1.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/Alert.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/SignUpView.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/client/view/ViewController.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/DTOFactory.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/UserServiceImpl.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/server/UserValidator.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/DTOentity/StateDTO.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/entity/Address.class
	webinvoice/webinvoice_alex/war/WEB-INF/classes/com/glassbox/webinvoice/shared/entity/State.class