ver 0.2.0
Merge branch 'master' of git://github.com/roxion1377/jdg

Conflicts:
	fe/Gemfile.lock
	fe/query.rb.pid
	fe/server.rb.pid