formatting
use jsonp notation
Merge branch 'jsonpatch'

Conflicts:
	src/main/java/org/lantern/LanternUtils.java