small changes, seven bootstapper added(grunt included)
merge