new feature
added button and checkbox
Merge remote-tracking branch 'origin/feature' into Development