Fran Ze
Merge branch 'master' of https://github.com/jazu/tikkusoftwares2

Conflicts:
	bin/projekti/projhallinta/AsiakasUI.class
	bin/projekti/projhallinta/ProjektiHallintaUI$2.class
	bin/projekti/projhallinta/ProjektiHallintaUI.class
	src/projekti/projhallinta/AsiakasUI.java