Add Service support
Add Component, Scope, Lazy annotations
Merge origin/master