Added video and create functions for recordings controller. Fixed merge conflict.