Merge branch 'hotfix/dropbox-move-to-jenkins' into develop
fix bug list length 0
Merge branch 'master' into develop

Conflicts:
	Gruntfile.coffee
- error fix
- restart server logic
Merge branch 'release/errorfix1'