Prod
Merge branch 'master' of https://github.com/liloQui/admin

Conflicts:
	static/js/app.js