Moving all changes in master but apiv2 code into master2
Adding new media images from previous commits
Updating some more changes from master
Changed help tab for FAQ and pointed it to faq page
#488 Some changes in apiv2 logging
#488 Fixed confilcts after merging with master