Merge branch 'dev2'
Merge branch 'master' of https://github.com/jdilag/git-testing