manual merge
merge
Merge branch 'master' of https://github.com/bloomweb/tickets

Conflicts:
	source/sites/all/themes/turnero/templates/node--video.tpl.php
db