Merge pull request #226 from DeKaN/master

Fixing playername at "modify portal info"
Highlighting 'Miss my R8' now works with own faction portals
Rearranged portal info
Return for full captions

Fixed bug with compressing key icon
Distance aligned to left as energy