avconv scale hd1080; Merge branch 'master' into cb
frame rate change to 24
frame rate change to 24; Merge branch 'cb' into cb-ext