Fixed some checkstyle baloney about finals.
Merge branch 'beta' of https://github.com/swansond/LavatoryLocator.git into beta