formated
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS/build.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS/src/ee/ut/math/tvt/hahyag/IntroUI.java
Fixed method usage