moved back to previous version
fixed select2 modal bug
merge