feat(issue): add correct handling with routeparams
Merge branch 'master' of github.com:angularjs-de/angularjs-freelancer-workshop
Formatting and small bugfixes
Merge branch 'master' of github.com:angularjs-de/angularjs-freelancer-workshop

Conflicts:
	client/app/scripts/controllers/user_edit_ctrl.js