Wave energy proposal gets marine energy funding