added custom bootstrap, custom grid and index form
fixed merge conflict