Commited code for fully functional application
Merge branch 'develop'