Merge branch 'master' into 1.x-develop

Author: quead

README.md

@@ -67,7 +67,7 @@ Angular2 YT Player v1.3
  - Show/hide video player
  - Repeat video
  - Grid/list mode for trending videos
-- **Settings (It will work when you can save the settings because now isn't relevant, (you can set default from "assets/settings.json")**
+- **Settings (you can set default from "assets/settings.json", soon will be directly from settings)**
 - *Change country for trending feed (currently only three countries, US, UK and RO)*
 - *Max results show in search (0 to 50)*
 - *YOUR_API Key*
@@ -100,7 +100,15 @@ Angular2 YT Player v1.0.0
 - Change time of your video that you want to listen
 
 ## Future features
+#### Backlog
+- Save your playlists **(unversioned)**
+- **Rooms**
+- *Room chat **(unversioned)***
+- **Settings**
+- *Save your settings **(unversioned)***
+
 #### Roadmap to 2.0
+- History of your watched videos **(in v1.4)**
 - Video details for current video, related videos and trending feed like number of views, likes and dislikes **(in v1.6)**
 - Share link for current video and related videos **(in v1.6)** 
 - Share link for current video at your playing time **(in v1.6)**
@@ -115,12 +123,11 @@ Angular2 YT Player v1.0.0
 - *Save your settings **(unversioned)***
 
 #### Roadmap to 3.0
-- **Rooms (in v3.0)**
+- **Rooms**
 - *Create room where you can watch videos with others in sync by sharing the room link **(in v3.0)***
 - *Set private/public room **(in v3.0)***
 - *List of public rooms **(in v3.0)***
 - *Room moderators which can add videos, kick roommates, mute roommates, rename room title and description **(in v3.3)***
-- *Room chat, **(unversioned)***
 
 ## Copyright and License
 Copyright [quead](https://github.com/quead) under the [MIT license](LICENSE).