[Kali] Gallery fixes
Merge branch 'master' of https://github.com/carlosvillademor/myJourney

Conflicts:
	static/js/main.js