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

Conflicts:
	Gruntfile.coffee