Update the /en_US/makerparty.json file (the updated file we are going to use for the 'live party' version site
Merge pull request #31 from mozilla/update-locale-file-in-master

Update the /en_US/makerparty.json file (the updated file we are going to use for the 'live party' version site
Merge pull request #35 from mmmavis/develop

Fix typo and remove from extra whitespaces from locale file
Fix typo and remove from extra whitespaces from locale file
Merge pull request #36 from mmmavis/master

Update locale source file
Update en_US source file (fix line indentation from 2 spaces to 4 spaces)
Merge branch 'master' of https://github.com/mozilla/makerparty into develop
Fix /resources pages links