dockerized version
Merge branch 'docker' into develop
bumping version on docker 1.4.1