initial merge with angular seed project