resolved conflict, tweaked some icons.
Merge branch 'fixos'
making things actually fit in the header.
Merge branch 'master' of github.com:systemed/iD