fix blue/redround's upload areas
Merge branch 'master' of github.com:pannal/torrentflux
Merge branch 'master' into custom
Merge remote-tracking branch 'origin/master' into custom