reverted to last commit
Merge branch 'develop' of https://github.com/thinkoverit/demo into develop