changes I don't really know
Merge branch 'master' of https://github.com/Targun/Stateship
Merge branch 'master' of https://github.com/Targun/Stateship
Merge branch 'master' of https://github.com/Targun/Stateship
Merge pull request #27 from BrockNeilson/master

Fix link cursor & styles on Email sheet
I don't know what
merged conflicts from brocks stuff
Merged conflicts
Merge pull request #28 from jhaddow/master

Merging stuff, I don't know what
Val and Spinner
Merge pull request #29 from SocketBot/master

Val and Spinner
minor changes to emailCtrl
Merge pull request #30 from jhaddow/master

minor changes to emailCtrl