Added concentration stones activity.
Merge branch 'master' of https://github.com/timofeysie/wherewithal

Conflicts:
	project.properties