added updateLayout
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev
test
fixed conflict
changed layout
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev