Use Rails 4 compatible activerecord-jdbcsqlite3-adapter gem
Merge branch 'master' into parallel
paperclip 2.x does not seem to work with ActiveRecord 4.x
Merge branch 'master' into parallel
Update .gitignore [ci skip]
Merge branch 'master' into parallel

Conflicts:
	.gitignore
Remove Ruby 1.8.7 and 1.9.2 from Travis builds
Merge branch 'master' into parallel