delete galleryview.css transparent border fix for ie6
tmp
finish apartment
finish new_home album
finish new_home news
Merge branch 'feature/collection' into develop
Merge branch 'develop'

Conflicts:
	app/assets/stylesheets/custom/galleryview.css
	db/schema.rb
Merge branch 'master' of https://github.com/zzfxtxcm/meifang