Add character count to action steps
Concept view now displaying updated timestamp for concept progresses
Change goal and mastery level descriptions per the rubric changes.
Teacher feedback for next steps.
Change concept number to concept name.
Escape newlines in concept descriptions
Removing simple_format commands causing line-breaks until a better solution can be found.
Cleaner line breaks.
Resources for parents added to Concepts, with external link capabilities.
Resources merged
Another change to Concept Progresses to reflect change in data needed by CMAST.
Change Concept show pages to organize abundance of data Teachers will need.
Disable some edit concept progress fields for teachers. Keeps them a bit more hands off.
Preliminary tooltips.
ACE'M explanation page added for students.
Merge branch 'changes'

Conflicts:
	Gemfile
	Gemfile.lock