Just a Try
test
Miss sales class, I will write one right now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/appengine-web.xml
	war/WEB-INF/web.xml