hadoop, struts unit test
Merge branch 'master' of https://github.com/adaikiss/xun

Conflicts:
	pom.xml