AddDirectory working, minor guards for FileController
Merge branch 'search' of https://github.com/luuse/NoHassleShare into search
Because things.