#355 Display image thumbnails on node display and po
Image Uploads Using WYSIWYG and Media in Drupal
Adding Workflow states for Advert.
Merge branch 'master' of github.com:mycognitive/ads_features
Conflicts:
	ads_advert/ads_advert.field_group.inc
	ads_homepage/ads_homepage.info
	ads_homepage/ads_homepage.views_default.inc
Conflicts:
	ads_homepage/ads_homepage.views_default.inc
Conflicts:
	ads_advert/ads_advert.info
Merge pull request #23 from nseam/master

Implementing Simpletests for Travis.
Merge branch 'master' of https://github.com/mycognitive/ads_features

Conflicts:
	ads_advert/ads_advert.features.inc