Query changes - user_id
Commit issue fix
Merge branch 'MasterLdap' of
https://github.com/dhanasiddharth/Dashboard.git into MasterLdap

Conflicts:
	src/main/webapp/login_fail.zul