Merge pull request #155 from Aurorastation/development

Update 05JUL2014
Merge pull request #156 from Aurorastation/development

FIXES A REALLY FUKIN SMALL BUG.
Merge pull request #158 from Aurorastation/development

Map Hotfix 05JUL2014
Merge pull request #2 from Aurorastation/master

Things.
Majestic custom items

Key, diary (lock and unlocked) and duck
Merge pull request #159 from Mr-Majestic/master

Something for skull to understand.