Security step1
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/blog/ArticleController.groovy
Merge branch 'master' of https://github.com/jarodez/blog-groovy-group