fixed front end bugs
Merge branch 'master' into dylan
Merge pull request #65 from mbathletes/dylan

Dylan