add boostrap
integrate grid system
make the responsive design
fix merge
Release 20130703.0