In my opinion: using the first sentence of the wikipedia articles for advertising and propaganda, I would argue that advertising is a sub-set of propaganda:
Propaganda is information that is used primarily to influence an audience and further an agenda, which may not be objective and may be presenting facts selectively to encourage a particular synthesis or perception, or using loaded language to produce an emotional rather than a rational response to the information that is presented.
Advertising is a marketing communication that employs an openly sponsored, non-personal message to promote or sell a product, service or idea.