issue #28: replace checkfunction to datasource
Merge branch 'develop' of github.com:studgent/android into develop