try to solve autolayout
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/mindmap/index.phtml
AutoLayout - versuch
Merge remote-tracking branch 'origin/master'
AutoLayout - versuch