Merge branch 'develop'

Conflicts:
	README.md

.gitignore

@@ -1,4 +1,8 @@
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -8,13 +12,20 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
-.DS_Store
 
-Carthage.pkg
-Carthage/Build
+## Carthage
+# Carthage/Checkouts
+Carthage/Build
+
+## SwiftLint
+SwiftLint.pkg

.swiftlint.yml

@@ -1,4 +1,6 @@
-included:
- - Cast
 disabled_rules:
- - function_body_length
+  - function_body_length
+  - todo
+included:
+  - Cast
+excluded:

.travis.yml

@@ -4,11 +4,11 @@ before_install:
   - brew update
   - brew install carthage
   - brew install swiftlint
-  - carthage bootstrap --verbose --platform mac
+  - carthage bootstrap --platform mac
 xcode_project: Cast.xcodeproj
-xcode_scheme: Cast
+xcode_scheme: Cast (Standard)
 branches:
   only:
     - develop
 script:
-  xctool -project Cast.xcodeproj -scheme Cast clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+  xctool -project Cast.xcodeproj -scheme "Cast (Standard)" clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

AppStore/AppStoreDescription

@@ -0,0 +1,35 @@
+- Improved code base
+- Added the ethical and AdFree `is.gd` URL shortener
+- Added `su.pr` StumbleUpon's URL shortener
+- New feature: Drag & Drop
+- New feature: Options menu
+- New feature: Configurable services
+
+Cast is an agent that lives in your system's Status Menu. Its purpose is to help you share information quick & easy.
+Cast seamlessly integrates with GitHub.com and allows you to create and edit gists on the fly.
+Cast is also a great URL shortener.
+
++ Drag & Drop
+Drop a text selection or text file on the Cast atomic icon available in your Status Menu and Cast will upload it for you automagically and supply a conveniently shortened link directly in your Pasteboard (⌘+V).
+
++ Recent Actions
+You may access a history of all your links from the Recent Actions drop-down menu available clicking the Cast atomic icon in the Status Menu.
+
++ Notifications
+Every time you perform a Share or Shorten action a convenient Notification is displayed with details about your action, directly from the notification you may open and check your shortened link.
+
++ Multiple Services Support
+You may choose different service providers from the Options panel and in case we don't yet support your favorite service, send us an support request: https://github.com/lfaoro/Cast/issues/new
+
+
+Coming Soon:
+
+- Custom Hotkey
+You may define a hotkey to use for Sharing and one for Shortening in the Options panel.
+The default hotkeys are: Share (CMD+SHIFT+C) - Short (CMD+ALT+C)
+
+- Recent Uploads synced with iCloud
+You may choose to Sync all your Recent Actions with iCloud using your Apple ID
+
+- Image sharing
+- Screenshots auto-upload