creating view for customer list (untenanted)
Merge remote branch 'origin/master'

Conflicts:
	lib/subscriptions.rb