bugfix
Merge branch 'master' of github.com:Weblinia/hage-web-2.0