Merge branch 'master' of github.com:weaties/testmm
updting .exp-flow file to support live branch, and master being the dev branch
Merge pull request #5 from weaties/master

promoting master into trunk
Merge branch 'live' into integration
Merge branch 'integration' into trunk
Merge branch 'trunk' into dev