git fix #123823
My Trades view, trade alert in home page, progress bar in draft, own user doesn't show in trade proposed
Merge branch 'dev' of https://github.com/sramirezayuso/Fifajalla into dev

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