Merge pull request #4 from ggodone-maresca/master

Fixed typo
New nav drawer, new icons, updated buttons
Conflict resolve
Added more Server functionality
Merge pull request #3 from abouthillier/master

Updating my fork