flowplayer flash
Merge branch 'master' of github.com:Wargo/reddevil

Conflicts:
	.gitignore
	View/Layouts/default.ctp
	View/Videos/view.ctp
Merge branch 'master' of github.com:Wargo/reddevil