Change names on XML file to lowercase and underscores
Fixed conflicts with changed XML file name
Merge branch 'master' of https://github.com/msfe/dinnerplanner