changes
Merge branch 'master' of https://github.com/anoopsinghbayes/tms

Conflicts:
	app/views/includes/foot.jade
	public/js/config.js
	public/js/directives.js