adding data feed for disable and insertion for User Admin page
Merge branch 'master' of https://github.com/sctravel/scTravel_staging

Conflicts:
	app.js
fix some issues for user login and ejs