fixes confirm in view
fixes user callback money function
Merge remote-tracking branch 'origin/master'

* origin/master:
  Caching complex queries, verifies_new_building, upgradable_buildings, merge, String und Integer als Value ind GameSettings unterstuetzt.