moved upload button
Merge branch 'jack' into develop

adding radio buttons
made upload show button nice
Merge branch 'develop' of https://github.com/dwkns/fireworks into develop

making sure online status appears
fixed merge conflicts