conflict commit
Merge branch 'master' of https://github.com/chandrasekhar4u/SunlightSolar.git
merged
Merge branch 'master' of https://github.com/chandrasekhar4u/SunlightSolar.git
Added screens to display user list.
and my-sql script.