Tweaks and stuff
merged files introUI
Merge branch 'master' of https://github.com/SETeam42014/test

Conflicts:
	POS/build.xml