Fix database connection issue
Add fish forms and lists with pngs
Update to use new gschool gem
Fix spec helper
Fix rake files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	app.rb
	spec/spec_helper.rb