Refactor class to ng-class to avoid bug
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop