Partial implementaion of displayData function
Corrected security issues.
Completed displayData function
Merge branch 'master' into displayData