fix indent and order.
remove views/javascript/config.jade
Merge remote-tracking branch 'origin/master' into refactoring_server
Merge pull request #283 from AssureNote/refactoring_server

Refactoring server