Layout, correção do bug openfire offline
Merge branch 'im' of https://github.com/wwagner33/solar into im