adds video capture but can't upload video
Merge branch 'master' of https://github.com/cahlan/ironswing-iOS

Conflicts:
	ironswing/ironswing/QueueViewController.m