Fixed a minor issue due to the past merging process;
Merge branch 'dev' of https://github.com/rpauls/SAE-NoMoreTeaTime into dev