Merge with Arti
Merge branch 'master' of https://github.com/reyesdiego/TerminalsUI
Fixing agp/prices routes
Merge branch 'master' of https://github.com/reyesdiego/TerminalsUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/matchprices.html
Adding parameter