Merge conflict resolution
merged feature/boostrap_angular