Update components branch alias for dev-master.

Signed-off-by: crynobone <crynobone@gmail.com>
Fix the definite article on evaluated
fix conflicts.