added tooltip and placeholder
fixed merge conflicts
Merge pull request #121 from rscottbradshaw/release-1

Added tooltip and placeholder to tags