fixed: Using $this when not in object context in php 5.3
Merge branch 'develop' into widget/user