merged from rohit's changes

Conflicts:
	app/scripts/views/employees.js