change apps to tech
change apps to tech, update merge conflicts in navbar and subtitle of tech
Merge branch 'develop' of https://github.com/postcode/annual into develop