Merge branch 'backend-branch' of github.com:Hackfmi/Diaphanum into backend-branch
Add template for adding new project
Merge branch 'backend-branch' of https://github.com/Hackfmi/Diaphanum into backend-branch
Merge branch 'backend-branch' of https://github.com/Hackfmi/Diaphanum into backend-branch
Merge branch 'backend-branch' of github.com:Hackfmi/Diaphanum into backend-branch
Move template folder for projects app
Move template folder
Move report.html to templates/reports folder
Add basic changes according to new model
Merge branch 'backend-branch' of github.com:Hackfmi/Diaphanum into backend-branch

Conflicts:
	projects/templates/projects/add.html
Merge branch 'backend-branch' of github.com:Hackfmi/Diaphanum into backend-branch
Remove m2m from protocol and add foreign key to topic
Add template folder for projects
Merge branch 'backend-branch' of https://github.com/Hackfmi/Diaphanum into backend-branch
Change search and list fields
Change search and list fields
Change test to work with the new model
Merge branch 'backend-branch' of https://github.com/Hackfmi/Diaphanum into backend-branch
Ups, I forgot the migration
Fix migrate