Switching to NodeJS to find more volunteers ;)
Merge branch 'master' of https://github.com/Hbas/FreePerformance

Conflicts:
	Vagrantfile
	source/freeperformance/planning/views.py
	source/freeperformance/templates/planning/index.html