modify user permission
user perm
all perm
Merge branch 'master' of github.com:lucasbodek/ads_features
last all perm
last all perm
Advert field changes + new advert variables
#346 Add Travis tests for ads_features
Merge branch 'master' of github.com:lucasbodek/ads_features
ADD TRAVIS
#347 ADS POINTS
Merge pull request #19 from lucasbodek/master

ADD TRAVIS
Merge branch 'master' of github.com:mycognitive/ads_features
Merge pull request #20 from lucasbodek/master

#347 ADD POINTS
Added simpletests to travis.yml [ADS-52]
 #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