Fixed merge conflict
Changed the ng-show on the message below the 2-min transcript for the new logic
Modified the variables and messages to reflect the change in premium transcript tasks
Twitter Conversion Tracking on Home Page

Twitter Conversion Tracking on Home Page
Conflict
Merge branch 'master' of https://github.com/Saltzshaker/pop-up-archive
Add total minutes count to home page
refactor the sequence of asking for credit card when ordering premium ondemand for the first time #741
Merge origin/homepage-stats into birdo
since "failed" is not final, treat messaging like failed==working. Also add cancelled, which is final. #740
merge status-messaging into birdo
enable small business plan #737
Merge branch 'small-biz-737' into birdo
add report to speechmatics check
merge conflict.  Please enter the commit message for your changes. Lines
starting
merge conflict w evil twitter pixel
Twitter Conversion Tracking on Home Page

Twitter Conversion Tracking on Home Page
Conflict
Merge branch 'master' of https://github.com/popuparchive/pop-up-archive

Trying to pull upstream master

nov2014 in master
Merge branch 'task-notifications' of https://github.com/shindostrz/pop-up-archive into task-notifications

Merging last changes on top of the new milestone branch.
Merge branch 'master' of https://github.com/Saltzshaker/pop-up-archive