Make location collection really work:)
Merge branch 'master' of https://github.com/almende/cape
Conflicts:
	cape-demo-android/src/main/java/com/almende/cape/android/CapeDemo.java