auto discover service if there is no $inject
Merge remote-tracking branch 'origin/master'