Fix: https://podio.com/bacondeczarcom/jj-jeans/apps/bugs/items/74
Merge branch 'develop' of https://github.com/jackjonesfashion/jeans into develop

Conflicts:
	src/scripts/com/jeans/routing/Router.coffee