Merge Michael (partial: Yolanda-only. CSS kept template-specific)
Merge branch 'master' of git://github.com/nursix/eden