made changes to all features page and web page
resolved conflicts on the demo page
Merging issue-51 into develop and resolving conflicts