Before Interface
Item Management, Item Viewing
Merge pull request #1 from solacedagony/master

Merge master into develop