add back in json module now that lift has released theirs
Merge branch 'master' of github.com:unfiltered/unfiltered

Conflicts:
	project/build.scala