WEB-6561 Emmet, bem filter: multiple element prefixes work incorrecly when class names contain '-'
Use system property "idea.maven.import.settings.file" when imports from maven model.
template groups
cleanup
IDEA-100729 Allow make 2nd level configurables available for non-default project only
IDEA-100740 Can not execute hg command with long argument list. Fix For merge commit action.

*If it's merge commit, so myFiles in HgCommitCommand is Empty. Need to commit all files in changeList,but  can't call setFiles() method.  see HgCheckinEnviroment->commit() method
*Check if filePaths is empty, then  try to commit without chunk.
*May produce ShellCommand error if there are many merged files. Need to fix this case.
restore "setSynchronized" method
Merge branch 'master' of git.labs.intellij.net:idea/community