Merge branch 'master' of https://github.com/kebal/ApachePOITesting

Conflicts:
	src/com/company/Main.java
Merge remote-tracking branch 'github/master'