pull back release 2.2 code

I wanted to work a bit on the type text into `<input>` tags feature. For that the changes to the release branch should be pulled back into develop. Especially the #395 bits, the handling of a return in the input tag will probably work with a similar mechanism.

The conflict is the `versionCode`, `versionName` in the manifest. Not sure who should fix that how.