[ADD]small image
[CHANGE] file interface
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/groups/files.html