testpage and testclass
Merge https://github.com/bartvitaly/S3ForMe

Conflicts:
	src/test/java/TestClass.java