Merge pull request #304 from tkowark/develop-ak

CanCan secured controllers
some acceptance tests
fixed merge conflicts