Merged eclipse/master. Flushed out last implementation for the Reflectivity Model.

Created by: KasperGam

Still many bugs. Had to resubmit to include the merge and my own changes. Fixed bug 471003.

I, Kasper Gammeltoft, (KasperGam) verify that I have a valid CLA and that all of the commits in this request are mine, although the merge commits that were automatically generated do not have a signed off by statement.

I also verify that this request is no more than 1,000 lines changed from master. The total real changes should be the same as the amount given on GitHub plus the merge changes from upstream, totaling at 697 line changes from master.