2014-09-25
Merge branch 'master' of https://github.com/limetech/dockerMan
sync with gfjardim