Started devel branch, feature development done. Server development is for bug fixes only from this commit onwards
Merge pull request #43 from ryanshawty/devel

Started devel branch, feature development done. Server development is fo...