added SEK and CAD currencies
added a load more currencies
added new currencies removed ab test as well
Merge branch 'master' into multicurrency
added ab test to show collar plan to people in editor
broken free trial func into own file. added ab test on upgrade button colour
delete old cookie keys
Merge branch 'master' into multicurrency
increased timeout for geoip to 3 seconds
Revert "increased timeout for geoip to 3 seconds"

This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
fixed SGD collab price
changed swiss franks to show Fr for display issues
coppied the lock manager over from doc updater
Merge branch 'master' into pdfng
added locks into editor controller for new/move/deletes

filesystem import manager uses the unlocked version
remove a couple of required coffee-scritps which are not required
Merge branch 'master' into pdfng
set up pdf viewer app in base
save pdf position and scale
working on zoom/fit buttons