Merge branch 'shweta-adding-baseline-code-for-services'

Conflicts:
public/modules/team/controllers/employees.client.controller.js
public/modules/team/controllers/team-anniversary.client.controller.js
public/modules/team/controllers/team-birthday.client.controller.js
public/modules/team/views/team-anniversaries.client.view.html
public/modules/team/views/team-birthdays.client.view.html
public/modules/team/views/team-employees.client.view.html
Merge branch 'master' of https://github.com/jzkung/dashboard

Conflicts:
	public/modules/team/controllers/employees.client.controller.js
	public/modules/team/controllers/team-anniversary.client.controller.js
	public/modules/team/controllers/team-birthday.client.controller.js
	public/modules/team/views/team-anniversaries.client.view.html
	public/modules/team/views/team-birthdays.client.view.html
	public/modules/team/views/team-employees.client.view.html