Merge branch 'master' into dev

# Conflicts:
#	lib/page/feed/feed_const.dart

README.md

@@ -23,3 +23,13 @@ If you interest in this project please let me know.[My Facebook](https://www.fac
 <img src="doc/09-media-no.jpg"/>
 
 <img src="doc/10-camera-no.jpg"/>
+
+# License
+The MIT License (MIT)
+Copyright © 2018 NieBin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/page/feed/feed_const.dart

@@ -24,6 +24,7 @@ class FeedImage {
   static const more_circle = "$IMAGE_PATH/feed_more.png";
   static const search_circle = "$IMAGE_PATH/feed_search.png";
   static const white_back = "$IMAGE_PATH/white_background.png";
+  static const feed_add = "$IMAGE_PATH/feed_add.png";
   static const city = "$IMAGE_PATH/city.png";
   static const shop_river = "$IMAGE_PATH/shop_river.png";
   static const feed11_city1 = "$IMAGE_PATH/feed11-city1.png";
@@ -33,6 +34,12 @@ class FeedImage {
   static const feed12_pic2 = "$IMAGE_PATH/feed12_pic2.png";
   static const feed12_header = "$IMAGE_PATH/feed12_header.png";
   static const feed12_plus = "$IMAGE_PATH/feed12_plus.png";
+  //Images for Feed1
+  static const feed1_avatar1 = "$IMAGE_PATH/feed1_avatar1.png";
+  static const feed1_avatar2 = "$IMAGE_PATH/feed1_avatar2.png";
+  static const landscape = "$IMAGE_PATH/landscape.png";
+  static const menonglass = "$IMAGE_PATH/menonglass.png";
+  static const night = "$IMAGE_PATH/night.png";
   static const feed13_header1 = "$IMAGE_PATH/feed13_header1.png";
   static const feed13_header2 = "$IMAGE_PATH/feed13_header2.png";
   static const feed13_header3 = "$IMAGE_PATH/feed13_header3.png";