Merge branch 'master' of https://github.com/apo-j/appforces-front

Conflicts:
	app/partials/header/menu/components/navbar-item.html