Added expiry dated to admin view of ads.
Corrected the way the keyword is found to wrap the url around.
Merge branch 'develop'