Merge pull request #3 from AncientAnton/master

_(:3 L)_
Change DB & Add Pop Menu
Merge pull request #2 from AncientLysine/master

Merge 20130428