feed javascript working again
Merge branch 'develop' of github.com:liampcollins/liannardo into develop