orders - from home
Merge branch 'master' of https://github.com/gtaranas/B2BRest

Conflicts:
	web/client/js/app/aura_components/features/main.js