cut
revert the side of line
Merge remote-tracking branch 'origin/develop'
changed database password to NO
search sort paging added
remove unwanted files
Merge branch 'develop'