committed the playController and videotags_model
Merge branch 'master' of https://github.com/anyTV/heartbeat

Conflicts:
	js/playController.js
Merge branch 'master' of https://github.com/anyTV/heartbeat

Conflicts:
	js/playController.js
Merge branch 'master' of https://github.com/anyTV/heartbeat

Conflicts:
	js/playController.js
Merge branch 'master' of https://github.com/anyTV/heartbeat
Fixed bug in Tags /play
For Demo
Merge branch 'master' of https://github.com/anyTV/heartbeat
Merge branch 'master' of https://github.com/anyTV/heartbeat
Merge branch 'master' of https://github.com/anyTV/heartbeat
message
Merge pull request #18 from robertsambuena/master

Merge pull request #1 from anyTV/master
Merge branch 'master' of github.com:anyTV/heartbeat

Conflicts:
	model/connection.php