Merge of develop.

All that good stuff. Icons, Revised Admin, Bug Fixes. Yum.