Fix unlock on merge
Merge pull request #973 from Morfent/patch-4

Fix unlock on merge
Tier updates

http://www.smogon.com/forums/threads/baseline-changing-executive-summary.3506982/page-2
Friendlier error messages for /fr
RU is having a suspect test and NU is now in beta
Raikou is still UU
http://www.smogon.com/forums/threads/smogon-usage-based-tier-update-june-2014.3508291/#post-5495706
Manaphy is BL
Merge pull request #974 from Slayer95/master

Friendlier error messages for /fr
Merge pull request #25 from Zarel/master

Patch 25