new changes
Merge branch 'master' of https://github.com/thiagol11/openstack-fall-summit-2014