merge diffs from develop to upgrade-angularjs branch
Merge remote-tracking branch 'upstream/upgrade-angularjs' into upgrade-angularjs
fix data/time picker inline block
fix upgrade angular after merging kareem changes