Merge branch 'develop' into issue-22
change present genres refill form
Merge branch 'issue-22' into develop