main test method
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/util/AppUtil.java
Merge branch 'master' of git://github.com/elysium986/GitPet
Merge branch 'master' of git://github.com/elysium986/GitPet
Merge branch 'master' of git://github.com/elysium986/GitPet
Merge branch 'master' of git://github.com/elysium986/GitPet
Merge branch 'master' of git://github.com/elysium986/GitPet
Merge branch 'master' of git://github.com/elysium986/GitPet
remove products