commit
Merge branch 'parser' of github.com:pelluch/mashups-backend into parser