Fix for booststrap loading
Merged bootstrap.responsive to basic
Merge remote-tracking branch 'upstream/user' into user
Add custom edit compound