Updated jsonizer code to ArrayList
Resolved merge conflict ApplicationState