Use '@' instead of $attr so controller sees attr
Merge branch 'master' into align-image
add popoverTarget parameter
fix image tests