ArticleService
Working on Master
Merge branch 'ArticleService', remote-tracking branch 'origin'

Conflicts:
	grails-app/services/mediahackday/ChannelService.groovy
	src/groovy/com/conmio/mediahackday/article/Article.groovy