Merge pull request #1 from foresta/develop

branch dao-
asfas
Merge branch 'develop' of https://github.com/foresta/tutorial into develop