UU changes: Zygarde/Torn-T -> BL, Weavile -> UU
Add 2014 April Friendly ladder
Fix crash in unlock
Merge remote-tracking branch 'upstream/master'