Merge branch 'release/2.1.0' into dev
update PHPTAL 1.2.3-a2
add .travis.yml
Merge branch 'release/2.1.1'

Conflicts:
	Vendor/phptal