Fix mocks.
Use routeParams
Merge branch 'develop' of github.com:czolnowski/ng-workshops into develop

Conflicts:
	app/scripts/app.js
Merge branch 'develop' of github.com:czolnowski/ng-workshops into develop