Merge branch 'master' into 'issue#120'
# Conflicts: # ui/nG6/pi6/class.tx_nG6_pi6.php The conflict only concerned php comments. I would have prefered to remove them, but the resulting script seemed really fishy on the git file compare display. Anyway, we'll be able to remove those comments later.
Showing with 508 additions and 152 deletions