Re-base upstream features.
Reset views api.
Updated make for features branch.
Updated to date 2.6
Merge pull request #309 from calstates4/dev-features

Pull features