#190 '?' recognizes integer as string now (if bug #248 is fixed).
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14