Adjusted merged (56b6776) code

 - added link to Rillke's user page on Commons
 - removed not-needed whitespace trimming
 - removed now-not-needed info about <templatedata>
   tags from the import window
 - added trimming of <templatedata> before on-the-fly
   checking of json syntax correctness