made changes to all features page and made privacy policy page and terms n conditions page
conflict resolved with issue-53 and merged with develop