Merge branch 'update/API-doc' into fix/bug/#38
Updated /node/status to reflect the status of the NIS server by using
the new API of the NIS server (/status)
Merge remote-tracking branch 'origin/master' into fix/bug/#38
view model corrected.
fixed switching accounts after creating or adding a new account doesn't work
disabled HTTPS options and Port textbox
Merge remote-tracking branch 'origin/fix/bug/#38' into integration/20140927
Merge remote-tracking branch 'origin/fix/issue#103' into integration/20140927
Merge remote-tracking branch 'origin/feature/settings-modal' into integration/20140927