Bootstrap boutton translated
Merge branch 'development' into integration