PFAM: Javascript errors fixed
Merge branch 'jon' into sprint5