fixing merge conflicts
added logout button on locate page and fixed title on station