Set progress bars to 100% on unlocks
Merge pull request #437 from dreamteam69/master

Set progress bars to 100% on unlocks
Check to see if things are unlocked first
Merge pull request #438 from dreamteam69/master

Check to see if things are unlocked first
Merge remote-tracking branch 'upstream/master'