Fixed merge issues with #PR151
Fixed merge issues with #PR151

WrathOfZombies/generator-office,jasonjoh/generator-office,WrathOfZombies/generator-office,jasonjoh/generator-office,WrathOfZombies/generator-office,jasonjoh/generator-office,OfficeDev/generator-office