update
Merge pull request #14 from vetrolamu/master

update from master
units terms fix
Merge branch 'alexg' of https://github.com/vetrolamu/edx-platform