Checkstyle
Merge branch 'master' of https://github.com/mmnguyen/shop.git

Conflicts:
	shop/.classpath