Merge branch 'master' into branch_name

Author: akshayaurora

eventsapp/data/images/background.png

@@ -1,9 +1,37 @@
 {
- "0.0.1": [
-   {
-    "logo": "data/images/logo.png",
-    "website":"https://in.pycon.org/2017/",
-    "about":"PyCon India, the premier conference in India on using and developing the Python programming language is conducted annually by the Python developer community. It attracts the best Python programmers from across the country and abroad."
-   }
-  ]
+	"0.0.1": [
+	  {
+	   "logo": "data/images/logo.png",
+	   "website":"https://in.pycon.org/2018/",
+	   "about":"PyCon India, the premier conference in India on using and developing the Python programming language is conducted annually by the Python developer community. It attracts the best Python programmers from across the country and abroad.",
+	   "photo": "https://paste.opensuse.org/images/85253798.png",
+	   "social":
+		   {
+		   "website": "http://pydelhi.org/",
+		   "twitter": "https://twitter.com/pydelhi",
+		   "facebook": "https://www.facebook.com/groups/ncrpython",
+		   "github": "https://github.com/pydelhi",
+		   "telegram": "https://t.me/joinchat/AAAAAEK2nzPg0IlwbbAing",
+		   "googleplus": "https://plus.google.com/communities/112480684024193475272",
+		   "youtube": "https://www.youtube.com/channel/UC3QVyJ-Zt0QoYAibn4SD20A",
+		   "meetup": "https://www.meetup.com/pydelhi/"
+		   }
+	   }
+	 ],
+	 "0.0.2" : [
+		{
+			"logo": "eventsapp/data/images/logo.png",
+			"website":"https://in.pycon.org/2018/",
+			"about":"PyCon India, the premier conference in India on using and developing the Python programming language is conducted annually by the Python developer community. It attracts the best Python programmers from across the country and abroad.",
+			"photo": "https://paste.opensuse.org/images/85253798.png",
+			"social":
+				{
+				"website": "https://in.pycon.org/",
+				"twitter": "https://twitter.com/pyconindia",
+				"facebook": "https://www.facebook.com/PyConIndia/",
+				"github": "https://github.com/pythonindia"
+				}
+		   }
+	 ]
 }
+   

eventsapp/data/images/menu/contactus.png

@@ -5,11 +5,11 @@
 			"about": "PyCon India, the premier conference in India on using and developing the Python programming language is conducted annually by the Python developer community. It attracts the best Python programmers from across the country and abroad.",
 			"photo": "https://in.pycon.org/2017/images/logo.png",
 			"social":{
-				"website": "https://in.pycon.org/2017/",
+				"website": "https://in.pycon.org/2018/",
 				"twitter": "https://twitter.com/pyconindia",
 				"facebook": "https://www.facebook.com/pyconindia",
-				"github": "https://github.com/pyythonindia",
-				"youtube": "https://www.youtube.com/user/inpycon",
+				"github": "https://github.com/pythonindia",
+				"youtube": "https://www.youtube.com/user/inpycon"
 			}
 		}
 	]

eventsapp/data/images/menu/history.png

@@ -0,0 +1,10 @@
+{
+ "0.0.1": [
+   {
+    "logo": "data/images/logo.png",
+    "quote":"Email: pyconindia@gmail.com",
+    "author": "",
+    "about":""
+   }
+  ]
+}

eventsapp/data/images/pylogo.png

@@ -0,0 +1,10 @@
+{
+ "0.0.1": [
+   {
+    "logo": "https://pbs.twimg.com/media/DgW2mMxXkAADOiw.jpg",
+    "website":"https://in.pycon.org/2018/",
+    "about":"PyCon India started in 2009 as a result of efforts by Noufal Ibrahim and a team of dedicated volunteers. In order to create an umbrella society for managing funds for PyCon India, the late Kenneth Gonsalves registered Indian Python Software Society (IPSS) in 2010 in Ooty, Tamilnadu. After the sad demise of Kenneth in August 2012, there was nobody to manage the affairs of IPSS in Ooty. In order to create an organization which could continue to be the centre of organizing affairs of PyCon India and related efforts, it was decided in an SGM of IPSS to register a new organization for the same in Bangalore, since most of the organizing members of PyCon India were based in Bangalore at that time. Thus, PSSI was registered in Bangalore in 2013 as the new society for managing affairs related to PyCon India.",
+   	"other" : "https://pbs.twimg.com/media/DgW4mEkW4AI-cuG.jpg"
+   }
+  ]
+}

eventsapp/data/images/pypeople.jpg

@@ -34,6 +34,16 @@
 	  "menu_item_text": "Sponsors",
 	  "icon_source": "data/images/menu/sponsor.png",
 	  "navigate_to": "SponsorScreen"
+	},
+	{
+		"menu_item_text": "Contact Us",
+	  "icon_source": "data/images/menu/contactus.png",
+	  "navigate_to": "ContactUsScreen"
+  },
+  {
+    "menu_item_text": "History",
+		"icon_source": "data/images/menu/history.png",
+		"navigate_to": "AboutPyConScreen"
 	}
   ]
 }