pull
wip
added AutoComplete
added insert image
merged atjs_test & fixed conflict