- Move tag out of condition package
- Add resource bundles on tags
Merge remote-tracking branch 'origin/master'