bundle install
assests
Merge branch 'development'
Merge branch 'development'
admin paramenters added