4 commits

Author	SHA1	Message	Date
Stella Rouzi	bbeae5e0ff	fix	2014-08-13 22:53:14 +03:00
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
Stella Rouzi	23bf55b66c	User/Person models merge	2014-06-30 15:46:06 +03:00