Finished ad-showing with placeholders for ads
merge branch 'showAds' into develop

adding feature show ads to develop