merging with bootstrap 3 + grunt

beta with the merge of bootstrap 3 / index2