temp commit
Merge branch 'master' of https://github.com/kr0y/PoolPay

Conflicts:
	src/com/angelhack/sksp/poolpay/PoolPayServiceImpl.java
	src/com/angelhack/sksp/poolpay/gitignpore/DummyAWSCredentials.java