added angular
minor changes
dsstore
fix conflict