test
Added all changes.
gingd
Merge branch 'master' of https://github.com/hairstonm/blog

Conflicts:
	.project
	bin
	grails-app/conf/BootStrap.groovy