manually merged PR86 with some modifications in line with review comments on github. Fixed a couple of typos and did a little bit of additional sync between the site filesfor consistency.

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6095 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino