Refactored proposal. Enabled cancancan
Merge pull request #356 from hennevogel/proposals

Refactored proposal. Enabled cancancan