Merge pull request #5 from jangelroa/master

activities_controller
got rid of the .coffee
generated controllers and templates. Put your code where it should go if it isnt there already