updated templates & controllers for Craft
Merge pull request #3 from benjamindavid/master

update for Craft