3 commits

Author	SHA1	Message	Date
Stella Rouzi	71dfb3b7e4	fix conflicts	2014-08-13 22:53:13 +03:00
Stella Rouzi	e2fb434dc7	Implement role authorization	2014-08-13 22:53:13 +03:00
Henne Vogelsang	c982cbb88a	Refactored proposal. Enabled cancancan	2014-07-23 16:24:05 +02:00