Merge pull request #97 from kudos-web/master

Update branch
Fixed fees form
Merge pull request #101 from kudos-web/Roy

Fixed fees form