Merge branch 'master' of https://github.com/mambax7/tag

# Conflicts:
#	class/formtag.php
#	docs/changelog.txt
#	include/action.module.php

Author: mambax7