Merge branch 'hotfix/server-redirect' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
complete include_code plugin
logger API
Update lib/init.js
- Don't load database when init
- Add `log` in global namespace
- Delete old database when updated
- Remove "help" command in console info
logger: singleton
New model API
Added file2 util
Remove timer util
Added debug log in init.js
Load database from db.json
Fixed file2
Added "Cache" model
logger: Detect error with property
Added method in asset model
Model renamed
Updated to file2
Merge pull request #201 from sonald/master

fix include_code plugin
fix typo in console/server
fix `generate --watch` for win32 platform