merge latest mean.io boilerplate