Merge branch 'dev' into yar
end day, work in progress
careers, in progress
end day, test resumes in progress
end day, careers and test almost ready
finish way careers
merge with dev
fix
Merge pull request #68 from is-valid/674_yar

674 yar
Merge branch 'dev' into 637-Feature