Fix database connection issue
Add fish forms and lists with pngs
Update to use new gschool gem
Fix spec helper
Fix rake files
Fix naming error
resolved merge conflicts