Minor changes i dont remember
Merge branch 'master' of github.com:The-WebOps-Club/fest-api

Conflicts:
	files/templates/pages/picker.html