changes from Seb's code review
removing notes file from repo as per seb
added planet info from rubric to base content module
Seb code review comment blocks
template.php function comments
formatting
resolving conflicts on template.php
resolve conflicit in template.php
Merge pull request #298 from Webcraft-Myplanet/uf-460

changes from Seb's code review
spacing and featurizing planets view setting
Merge branch 'develop' into uf-458
merging
merge conflict on module
Merge pull request #297 from Webcraft-Myplanet/uf-458

added planet info from rubric to base content module
added chart.js
progress chart updating
percentage showing in progress graph
removed code from uf-util
Merge pull request #299 from Webcraft-Myplanet/uf-462

Uf 462
fixed merge conflicts in sass