pushing semi integrated code
Merge branch 'master' of https://github.com/kr0y/PoolPay

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/PoolPay.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/poolpay/R$id.class
	bin/classes/com/example/poolpay/R$layout.class
	bin/classes/com/example/poolpay/R$menu.class
	bin/classes/com/example/poolpay/R$string.class
	bin/classes/com/example/poolpay/R$style.class
	bin/classes/com/example/poolpay/R$styleable.class
	bin/classes/com/facebook/android/R$id.class
	bin/dexedLibs/android-support-v4-de541b7744170a573c8eedb755dfc085.jar
	bin/dexedLibs/facebooksdk-484f4c19eff35fe48df95a09117aac88.jar
	bin/resources.ap_
	gen/com/example/poolpay/R.java
	gen/com/facebook/android/R.java
	src/com/angelhack/sksp/poolpay/DynamoDBController.java
	src/com/angelhack/sksp/poolpay/PoolPayServiceImpl.java
	src/com/angelhack/sksp/poolpay/gitignpore/DummyAWSCredentials.java