Added bootstrap support
Fix conflict
Merge remote-tracking branch 'origin/develop' into develop
Added client architecture