Merge branch 'angular-tests' of https://github.com/giant-rabbit/civicrm-core into...