allow to specify shell commands directly in yaml
Merge branch 'master' into jacalvo/shellcmd

Conflicts:
	ChangeLog
Merge pull request #52 from Zentyal/jacalvo/shellcmd

Jacalvo/shellcmd