Angular Templates & coffee
Merged Master Branch