Menu reordering and stats
Merge branch 'master' of https://github.com/sramirezayuso/Fifajalla

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/history.html.erb