Resolving conflicts in pull request #55 from josebama:placeholderViewFix
Merge branch 'josebama-placeholderViewFix'