Updated service comments
Fixed mergeconflict
Commented controller
[Shayan] Wrapped services, app, controllers in anonymous namespace.