renamed a method
Merge branch 'dev' of http://github.com/tomorrow-nf/wpi-suite-team5 into dev