minor changes
Merge branch 'master' of https://github.com/Capstone-Team-3/open-fluency

Conflicts:
	OpenFluency/grails-app/views/chapter/show.gsp