upgrade to latest bootstrap3#70

wookiecooking wants to merge 2 commits intoalexanderjulo:masteralexanderjulo/wiki:masterfrom

wookiecooking:masterwookiecooking/wiki:masterCopy head branch name to clipboard