Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

# Conflicts:
#	lib/ui/home/home.dart

lib/service/api.dart

@@ -154,7 +154,7 @@ print("this is body "+body.toString());
         // Array to Map Json
         Map<String, dynamic> myData = arrayToJson(response.body);
 
-        print(myData);
+//        print(myData);
 
         _model = shoplistModel.fromJson(myData);
       }else{

lib/ui/home/home.dart

@@ -24,7 +24,9 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
 
   HomePresenter presenter;
  @override
-  void initState(){
+  void initState() {
+   super.initState();
+
    presenter = HomePresenter(this);
    presenter.Listitem();
 

lib/ui/shop/shop_list.dart

@@ -14,12 +14,17 @@ class ShopList extends StatefulWidget {
 
 class _ShopListState extends State<ShopList> with TickerProviderStateMixin {
   var entries = new List<String>.generate(2, (i) => "Item $i");
+
   ShoplistPresenter presenter;
 
   @override
   void initState() {
+    super.initState();
+
     presenter = ShoplistPresenter(this);
     presenter.Listitem();
+
+
   }
 
   @override
@@ -265,7 +270,7 @@ class _ShopListState extends State<ShopList> with TickerProviderStateMixin {
           bottom: SizeConfig.getPadding(10),
         ),
         child: ListView.builder(
-            itemCount: entries.length + 1,
+            itemCount: entries.length,
             itemBuilder: (context, i) {
               final widgetItem = (i == entries.length);
                new RaisedButton(