Message delete completed
Message delete updated
Top discussion generated and Content filtered
Search page updated
add new dependency
Merge remote-tracking branch 'upstream/master'
Checking for error
error handled
conflict handled
conflict handled
UploadHandler.java updated
front page search box action handled
profile and health tips updated
Merge branch 'localdev'
Merge pull request #15 from olein/master

merged all changes