Change UltiSnipsExpandTrigger
Merge branch 'dev' into clang_complete