several features
Merge branch 'master' of github.com:EdwardFox/photoweb