Fixed bugs, reverted some code changes for toolbar inclusion
Merge pull request #17 from karuto/gallerydev

Fixed bugs, reverted some code changes for toolbar inclusion