Added funding model methods
Updated funding view
Merged master and branch