Adding new EmebrCli and web templates
Merge branch 'master' of https://github.com/peter-watters/BitchPlease