adjust stylesheets
delete plupload
user query function
Merge branch 'master' into develop