adding merge tags to the content admin
Merge branch 'refs/heads/kohana_v3.3/feature/content_merge_tags' into kohana_v3.3/master