Merge branch 'test' of github.com:project-fifo/jingles into test
Fixed stupid js loop thing ...
Merge branch 'test' into dev