stable code
changes for responsive layout
Some changes for bootstrap
Merge remote-tracking branch 'github/master'