merge now
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
Delete sqlite-jdbc(please use at outside PJs)