Fetching set up for URL and Video form
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	config/routes.rb