IN PROGRESS- #7
Merge branch 'master' of https://github.com/maikop/Kvaliteetsed-Ideed.git
IN PROGRESS- #8
Merge branch 'master' of
https://github.com/maikop/Kvaliteetsed-Ideed.git

Conflicts:
	build.xml
	src/ee/ut/math/tvt/kvaliteetsedideed/IntroUI.java
Merge branch 'master' of https://github.com/maikop/Kvaliteetsed-Ideed.git