merge changes from master into dev

README.md

@@ -1,23 +1,30 @@
-[![Build Status](https://api.travis-ci.org/Firebottle/Firebot.svg)](https://travis-ci.org/Firebottle/Firebot)
-[![dependencies Status](https://david-dm.org/Firebottle/Firebot/status.png)](https://david-dm.org/Firebottle/Firebot)
+Firebot
+======
+An app that allows streamers on Mixer.com to quickly and easily setup versatile interactive boards and chat commands. It supports sound board buttons, api buttons, game controls, scene changes, group changes, and more all on the same interactive board at the same time. This allows any user to have a variety of fun buttons for their audience to interact with at any time.
 
-# Firebot
-An app that allows streamers on Mixer.com to quickly and easily setup versitile interactive boards.
+[![Build Status](https://api.travis-ci.org/Firebottle/Firebot.svg)](https://travis-ci.org/Firebottle/Firebot)
+[![Dependencies Status](https://david-dm.org/Firebottle/Firebot/status.png)](https://david-dm.org/Firebottle/Firebot)
+[![Total Downloads](https://img.shields.io/github/downloads/firebottle/firebot/total.svg)](https://firebot.pro)
+[![Version](https://img.shields.io/github/release/firebottle/firebot.svg)](https://github.com/Firebottle/Firebot/releases)
+[![Discord](https://img.shields.io/discord/372817064034959370.svg?label=Discord+(chat))](https://discord.gg/DegW792)
+[![Social](https://img.shields.io/twitter/follow/firebotapp.svg?style=social&label=Follow+Us!)](https://twitter.com/FirebotApp)
 
-## What is this?
-Firebot is an app for use by streamers on Mixer.com. It allows any streamer to quickly and easily setup interactive controls for their channel. It supports sound board buttons, api buttons, game controls, scene changes, group changes, and more all on the same interactive board at the same time. This allows any user to have a variety of fun buttons for their audience to interact with at any time.
+***
 
 ## Can I use it now?
 Yes, just head on over to [the releases page](https://github.com/Firebottle/Firebot/releases) and download the newest version!
 
 ## But how do I use it?
-Check out the getting started guide over at [the wiki](https://github.com/Firebottle/Firebot/wiki/Getting-Started) which also has a video tutorial.
+The app will help you with the first steps when you first open the app. You can also head to [our website](https://firebot.pro/tutorials/) where we have lot of great video tutorials made by the community.
+
+## What if I have a question or need more help?
+Feel free send us a [tweet](https://twitter.com/FirebotApp) or come visit our [Discord server](https://discord.gg/DegW792). 
 
 ## I found a bug, who do I contact?
 Just head over to the [issues](https://github.com/Firebottle/Firebot/issues) page and create a new issue.
 
 ## I have a new feature idea!
-Submit feature requests at the [issues](https://github.com/Firebottle/Firebot/issues) page. Please note that this is a very general purpose app and not all feature requests will be kept.
+Submit feature requests at the [issues](https://github.com/Firebottle/Firebot/issues) page. Please note that this is a very general purpose app and not all feature requests will be implemented.
 
 ## License
 This code (everything in the repository) is provided under the GNU General Public License v3.0. This means that you're free to take the code in this repository and modify it in whatever way you like and distribute this code for any purpose. However, if you release it then it must be under this same license, make it open source, and provide documentation of changes made. All versions must have copyright credit pointing back to this source.

resources/notifications.json

@@ -1,10 +1,4 @@
 [
-    {
-        "id": 0,
-        "title": "The overlay URL has changed!",
-        "message": "<div>As of <b>v4.4.0</b>, the overlay is now hosted on a local web server! <br/><br/> Instead of selecting the path to the local file, you just need to put the following URL for your Browser/Webpage Sources:</div> <br/> <div class=\"well\" style=\"background:white;\"><a href ng-click=\"rootScope.openLinkExternally('http://localhost:7473/overlay')\">http://localhost:7473/overlay</a></div>",
-        "icon": "alert"
-    },
     {
         "id": 1,
         "title": "Subs not seeing their board?",