alex, andrei added npm modules to gitignore
alex, andrei added @EnableWebMvc again
Merge branch 'refactor_xml'