Merge pull request #44 from satsalou/issue-43

chore(readme) Issue #43: Update README.md with versions naming convention

Author: skounis

README.md

@@ -89,6 +89,11 @@ In case that the required Cordova plugins are not installed while installing Nod
 * **cordova-plugin-whitelist** - This plugin implements a whitelist policy for navigating the application webview on Cordova 4.0
 * **cordova-plugin-transport-security** - Cordova / PhoneGap Plugin to allow 'Arbitrary Loads' by adding a declaration to the Info.plist file to bypass the iOS 9 App Transport Security
 
+## Branches naming convention
+Each branch is related to the Ionic framework version the source code is based on. Currently, there are the following branches:
+1. `master`: Main development source code
+2. `1.1-1.x`: Source code maintenance based on Ionic 1.1.x
+
 ## Credits
 
 * [Yeoman](http://yeoman.io/)

changelog.md

@@ -2,8 +2,7 @@
 ```
 2.0 - December 31, 2015
 - Ionic update to v1.2.1
-- New module demonstrating Native Scrolling
-- New module demonstrating New Slide Box
+- Demonstration examples of Native Scrolling as it is now Ionic's default and Ionic's Slide Box based on Swiper widget (http://blog.ionic.io/announcing-ionic-1-2/)
 
 1.2 - December 22, 2015
 - Downgrade Cordova iOS to 3.9.2 so there is no conflict with the plugins used