Template folder for multi
Merge branch 'work' of github.com:Neraste/dakara into work

Conflicts:
	server/music/views.py
Change folder for multi merge
People listing and creation
Merge branch 'work' of github.com:Neraste/dakara into work