Merge branch 'develop'

Conflicts:
	README.md

.gitignore

@@ -9,7 +9,7 @@ dist.zip
 # Ignore installed node modules
 node_modules/
 testpin.json
-
+icon-images/
 #ignore the netbeans folder
 nbproject/
 

README.md

@@ -2,37 +2,40 @@
 
 Pebble app to display upcoming, live and completed CSGO match details
 
-This app is currently in beta, and the basic functionality works. Displays all upcoming CSGO match information,
-as well as completed match information with extra detials listed if you click through (see screenshots for example)
+Displays all upcoming CSGO match information,
+as well as completed match information with extra detials listed if you click through (see screenshots for example). You can also filter the results to what you desire
 
 App can be found here:
 http://apps.getpebble.com/en_US/application/57c24bc35e3c3db4850002af
 
+http://pblweb.com/badge/57c24bc35e3c3db4850002af/orange/small
+
 This app is built entirely with [pebbleJS](https://pebble.github.io/pebblejs/). If it gets enough liking, I will consider re-writing the watch part in c (so its native, performance and battery boost etc)
 Originally written in pebblejs as it was super easy, didnt have to worry about appmessage and could get a prototype up pretty quick (within 8 hours I had a working app)
 It seems I will have to rewrite in C, or wait until they release rockyjs api to have this working with pebble2 :(
 
+#### Known issue
+There is an issue where I can't seem to reload the page after a config change in the settings page. This just means if the filter results that are returned after you change the filters are fewer then what is already displayed on the screen, you will see old results until you restart the app. Still trying to find a work around for this
+
 ### How to use
 
 1. Install the app!
 2. Scroll through the menu to view details!
-  * Press the select button on any completed Match to show more details
+* Press the select button on any completed Match to show more details
+* Long Press on any upcoming match to add a pin to your timeline!
 
 ### Features
 * view live, upcoming and completed CSGO match details
 * view more information for completed matches
 * Pin upcoming matches to your timeline, and be reminded when they start
+* filter your results based on the teams/tournaments you want to follow!
 
 ### screenshots
 
 
-### Upcoming features in 1.0 release
-
-1. Configuration page
-  * Filter results how you want. Choose what tournaments you want to see, what teams you wish to only see, and what type, and how many
-2. Pin upcoming matches to your timeline with long press!
-3. Colour!
-4. Diorite support (os4.0)
+### Upcoming features in 1.1 release
+1. Colour!
+2. Diorite support (os4.0)
 
 ### Feature ideas for later releases
 

appinfo.json

@@ -1,5 +1,8 @@
 {
   "appKeys": {},
+  "capabilities": [
+    "configurable"
+  ],
   "companyName": "MrWhale",
   "longName": "CS on the GO",
   "resources": {
@@ -13,7 +16,7 @@
       {
         "file": "images/CSontheGO-inverted-splash2.png",
         "name": "IMAGE_LOGO_CSGO_SPLASH",
-        "type": "png"
+        "type": "bitmap"
       },
       {
         "file": "images/tile_splash.png",
@@ -31,11 +34,12 @@
   "shortName": "CSontheGO",
   "targetPlatforms": [
     "aplite",
-    "basalt"
+    "basalt",
+    "diorite"
   ],
   "uuid": "5a4dc87b-bc0a-480d-aade-6dbf5da39e1c",
   "versionCode": 1,
-  "versionLabel": "0.8",
+  "versionLabel": "1.0",
   "watchapp": {
     "hiddenApp": false,
     "watchface": false