Autolayout outsourced
Zoomin and out
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/mindmap/index.phtml