update to app with new features
Merge remote-tracking branch 'upstream/master'