Refactored DataService
Merge branch 'master' of https://github.com/chz160/NoInk.git