fixed null pointer bug when there is no text
Merge branch 'master' of https://github.com/DejanRistic/LabeledImageView