Tags support (for images / files) and minor bugfix
Bugfixes and improvements (tag support etc.)