prepare to deploy
update to grunt and getting ready for deploy
update to grunt and getting ready for deploy
merge conflict resolve
ready to deploy
minor fixes