Merge branch 'master' of https://github.com/elkarte/Elkarte into theme
Merge branch 'master' of https://github.com/elkarte/Elkarte into theme
Merge upstream/master into theme
Cleaned up a few inline styles. More mess added to admin.css. :)
Signed-off-by:ichbin <ichbin@ichbin.us>
Merge pull request #1064 from IchBin/theme

Inline styles admin