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

Conflicts:
	app/index.html