edit Advertisement changes .2014_7_24
Merge remote-tracking branch 'origin/master'
Merge conflict resolved - 24-July-2014