Added stubs for services and controllers
Added stubs for controller and services
Added minor changes
Updated templates in index.html
Merged app.js changes