Started on JSON conversion
Added Salbans stuff

Merge remote-tracking branch 'origin/master'
Button fixed