update
Merge branch 'master' of https://github.com/ravihamsa/backbone-requirejs

Conflicts:
	models/departments.js
	models/designations.js
	models/user.js
	pages/page2.js
	widgets/table.js