Added contentapi
Merge branch 'master' of https://github.com/maguire0/git-repo

Conflicts:
	NewsHackProject/grails-app/views/sample/index.gsp