Merge branch 'master' of https://git.gitorious.org/foursail/foursail
Merge branch 'master' of github.com:Maledictus/foursail
Add photo uploader