Merge branch 'master' into EAP

.github/ISSUE_TEMPLATE.md

@@ -1,30 +1,38 @@
-!!Pleas use the template, otherway we will close the github issue!!
+<!--- 
 
-If this is a bug report or support request please make sure you have filled the following in:
+!! Please use the Support / bug report template, otherwise we will close the Github issue !!
-(If it's not a bug/support request and a feature request pleas submit your feature request over here: http://feathub.com/tidusjar/PlexRequests.Net)
 
-#### Plex Requests.Net Version:
+(Pleas submit a feature request over here: http://feathub.com/tidusjar/Ombi) 
 
-#### update Branch:
+--->
+
+#### Ombi Version:
+
+V 1.XX.XX
+
+#### Update Branch:
 
 Stable/Early Access Preview/development
 
 #### Operating System:
 
+(Place text here)
 
 #### Mono Version (only if your not on windows)
 
+(Place text here)
 
 #### Applicable Logs (from `/logs/` directory or the Admin page):
 
 ```
-Logs go here (Please make sure you remove any personal information from the logs)
+
+(Logs go here. Don't remove the ``` tags for showing your logs correctly. Please make sure you remove any personal information from the logs)
 
 ```
 
 #### Problem Description:
 
-
+(Place text here)
 
 #### Reproduction Steps:
 

README.md

@@ -1,5 +1,5 @@
+# Ombi
 
-![](http://i.imgur.com/s4nswSA.png?1)
 ____
 [![Gitter](https://badges.gitter.im/tidusjar/Ombi.svg)](https://gitter.im/tidusjar/Ombi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex)
@@ -9,11 +9,13 @@ ____
 [![Github All Releases](https://img.shields.io/github/downloads/tidusjar/Ombi/total.svg)](https://github.com/tidusjar/Ombi)
 [![Stories in Progress](https://badge.waffle.io/tidusjar/Ombi.svg?label=in progress&title=In Progress)](http://waffle.io/tidusjar/Ombi)
 
-
 # Features
 Here some of the features Ombi has:
 * All your users to Request Movies, TV Shows (Whole series, whole seaons or even single episodes!) and Albums
 * Easily manage your requests
+* User mangement system (supports plex.tv accounts and local accounts) [NEW]
+* Sending newsletters [NEW]
+* Fault Queue for requests (Buffer requests if Sonar/Couchpotato/SickRage is offline) [NEW]
 * Allow your users to report issues and manage them seperatly
 * A landing page that will give you the availability of your Plex server and also add custom notification text to inform your users of downtime.
 * Allow your users to get notifications!
@@ -23,9 +25,10 @@ Here some of the features Ombi has:
 * It automatically update the status of requests when they are available on Plex
 * Slick, responsive and mobile friendly UI
 
+
 ### Integration 
 We integrate with the following applications:
-* Plex (Obviously!)
+* Plex server 1.2 (and higher)
 * Sonarr
 * SickRage
 * CouchPotato
@@ -39,6 +42,13 @@ Supported notifications:
 * Slack
 * Weekly Recently Added email notification to all of your Plex Users!
 
+# Feature Requests
+Feature requests are handled on FeatHub.
+
+Search the existing requests to see if your suggestion has already been submitted.
+(If a similar request exists, give it a thumbs up (+1), or add additional comments to the request)
+
+#### [![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](http://feathub.com/tidusjar/Ombi)
 
 # Preview
 
@@ -67,9 +77,9 @@ If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
 ### A massive thanks to everyone for all their help!
 
+
 ## [Feathub](http://feathub.com/tidusjar/Ombi)
 [![Feature Requests](http://feathub.com/tidusjar/Ombi?format=svg)](http://feathub.com/tidusjar/Ombi)
 
-
 ## Stats
 [![Throughput Graph](https://graphs.waffle.io/tidusjar/Ombi/throughput.svg)](https://waffle.io/tidusjar/Ombi/metrics/throughput)