add some in-code documentation (test commit)
Commit from Sugar Labs: Translation System by user cjl.: 435 of 435 messages translated (0 fuzzy).
Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline
fix problem loading trash palette (alan aguiar)
resolve duplicate attribute of TurtleArtWindow: 'parent' and 'activity'
Commit from Sugar Labs: Translation System by user cjl.: 435 of 435 messages translated (0 fuzzy).
make tawindow.TurtleArtWindow._lazy_init inheritable by adding a parameter
make tawindow.TurtleArtWindow._setup_misc inheritable by adding a parameter
add documentation of the new parameters in tawindow
Merge branch 'tawindow-parent-activity'
fix 'None-Pointer' error when plugin list is empty
inheritable tawindow (marion zepf)
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
parent is not activity (marion zepf)
Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline

Conflicts:
	TurtleArt/tawindow.py -- accepted everything from mainline
news for v182
migrate to turtle-centric model
migrate plugins to turtle-centric model