Fixed conflicts of merging last time

Now it can run with icon and flash, Wow wow! and you have to add
JSONKit supporting before you build it successfully, cause the folder
is empty.