aded stuff
Merge branch 'master' of https://github.com/aws-reinvent-hackathon-2013-team/UnitedWayRESTBackend

Conflicts:
	src/main/java/ch/furthermore/demo/st/PointResource.java
Merge branch 'master' of https://github.com/aws-reinvent-hackathon-2013-team/UnitedWayRESTBackend
whatever