Welcome Decoda 6.x
Merge branch '5.x-dev' into 6.x-dev

Conflicts:
	Emoticon/Matcher/Dumper/PhpMatcherDumper.php
Sets a Decoda parser when is not set yet on EmoticonHook class
Merge branch '5.x-dev' into 6.x-dev
Merge branch '5.x-dev' into 6.x-dev
Merge branch '5.x-dev' into 6.x-dev
Follow decoda version
Merge pull request #58 from alquerci/6.x-dev

[6.x] Update to Decoda version 6
Merge branch 'add_missing_filters' into table_filter

* add_missing_filters:
  Add video filter
Add new decoda table filter
Merge pull request #61 from alquerci/table_filter

[6.x] Add new decoda table filter and previous missings
Fix use statement on EmoticonHook (closes #63)
Fix error on cache:clear (closes #62)
Add php 5.3.3 and 5.5 on travis-ci
Merge pull request #64 from alquerci/issue62

[5.x] Fix error on cache:clear (closes #62)
Merge pull request #65 from alquerci/issue63

[5.x] Fix use statement on EmoticonHook (closes #63)
Revert "Fix error on cache:clear (closes #62)"

This reverts commit 6945a23bc50352db9b41049af62e5050114631a0.
Fix error on cache:clear (closes #62)
Merge remote-tracking branch 'origin/add_missing_php_version' into issue62
Merge pull request #67 from alquerci/issue62

Fix previous pull request #64