Merge pull request #7681 from thompsnm/develop

Separate call to upgrade npm so that it occurs before any other installs

Dockerfile

@@ -25,7 +25,8 @@ RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/*
 
 # Install global packages
-RUN npm install -g gulp grunt-cli bower npm@3
+RUN npm install -g npm@3
+RUN npm install -g gulp grunt-cli bower
 
 # Clone Habitica repo and install dependencies
 WORKDIR /habitrpg