final :(
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/mindmap/index.phtml
	www/js/mainMenuView.js