updating views for 1.5.0
set `master` during first upload
polaroid image style
CS fixes
change default gallery directory
updating schema: adding created rename join table
fix habtm ordering
Merge branch '2.1-habtm-updates' into 2.1