Denver proposes raising marijuana tax as part of plan to double affordable housing fund