Fix pom.xml due to build problem

Signed-off-by: Tzu-Li Tai <tzulitai@ee.ncku.edu.tw>
Merge remote-tracking branch 'origin/master' into johnny

Conflicts:
	pom.xml