Merge remote-tracking branch 'refs/remotes/origin/master' into ui-update

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-30 09:55:34
Author local date 2016-07-30 02:55:34 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-30 09:55:34
Committer local date 2016-07-30 02:55:34 -0700
Commit eeed94a081970c60ed02e384f2c877668def3c80
Tree 979cea16af2669b5ea5038de2684d569615e29b8
Parent 086608b2c2b420849297c4b1edfd6e22e3a1c06e
Parent 05e4b346d2107da14e14312a83ca5d69572bd914
Merge remote-tracking branch 'refs/remotes/origin/master' into ui-update
Affected files:
You may download the files in Public Git.