Merge remote-tracking branch 'dean/master'
Re-implementing file name/path for images and cineloops
Removing Cineloop, replacing with generic Image active record
Removing unneeded class
Converting old study to interview structure
Merge remote-tracking branch 'dean/master'
Removing debug stuff
merge from patrick
Merge remote-tracking branch 'patrick/master'