Merge branch 'master' of C:\angularjs-freelancer-workshop with conflicts.
Merge remote-tracking branch 'origin/master'
new: issues edit/detail