issue fixed
Merge branch 'development'
Remove btn-primary class