Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Add centos image
Merge branch 'staging'
add httponly and secure flags for cookies created by socketio
Merge pull request #238 from mistio/cookie_fixes

add httponly and secure flags for cookies created by socketio
Revert "add httponly and secure flags for cookies created by socketio"
Merge pull request #239 from mistio/revert-238-cookie_fixes

Revert "add httponly and secure flags for cookies created by socketio"
Fix key upload
Fix file upload popup css and cleaning up of controller
ui fix for creating machines in NephoScale, also remove redundant args for create node
Merge pull request #241 from mistio/nephoscale_fix

NephoScale deploy fixes
Automated build of mist.js & mist.css
Merge pull request #240 from mistio/fix_key_upload

Fix key upload