More changes to backend and AmazonParser.
Merge branch 'master' of github.com:rafiss/transparent

Conflicts:
	backend/transparent/core/Server.java