json func added
Merge branch 'master' of https://github.com/cubetone/jpopclub

Conflicts:
	src/com/jpopclub/app/web/controller/BoardController.java