closes #1108
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
upgrade fix for new installs
added check to upgrade.upgrade
less is more
Merge remote-tracking branch 'upstream/master'