Auto Commit - Sat May 17 18:35:29 EDT 2014 (Bahamut)
Auto Commit - Sat May 17 19:00:02 EDT 2014 (Bahamut)
Add in proper armor materials for the new armors, and set their armor display values
Merge remote-tracking branch 'origin/master'