Adding bower+angular, template paths, templates from other project
merge