issue2662 OC: leichtes Klettern
Merge branch 'master' into issue2662-leichtes-klettern

Conflicts:
	.gitignore
Fixes #2692, NB 2013.05.02 crashes at start

Modified proguard.cfg to include all methods of the view injector
classes.
Database update

* changed from O% to OC% - at least in OC caches the attributes seem to be the same (across sites)
* changed english text
Merge pull request #2691 from koem/issue2662-leichtes-klettern

Fixes #2662 leichtes klettern