Add Features in action section
Merge remote-tracking branch 'upstream/master' into bootstrap-admin