dev
Merge branch 'version1.0' of github.com:paper777/EyeProtected-APP into version1.0