update + features 2

Signed-off-by: Joshua Martin <josh@insights.net.au>
Merge branch 'master' of github.com:joshuamartin/mi7_core_features