add assetviews in location
migration for location combo code
updates for student residence
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
	db/schema.rb