Merge branch 'master', remote-tracking branch 'origin'
add guard, rockmongo, behatWizard and behat