commit
commit
update
modify
modify
Merge branch 'master' of https://github.com/bbkedu/IMC-Designer

Conflicts:
	app/views/try_it.tmpl.html