update ignore, add components, update grunt
update ignore
merge