replaced @import for paypal and dropbox
Merge branch 'develop'