Refactor context.xml-s because twice instantiated beans
Merge branch 'master' of https://github.com/adamszabo/fitty