update files
delete angular-seed
reoslve conflict