Added some Generic function in Display class
Merge branch 'master' into Users