Resolve bug in HelperTest.java
Merge branch 'develop-PFE2015' of https://github.com/SmartCampus/middleware into develop-PFE2015