Bump version

Author: Jelte Lagendijk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "calendar",
-  "version": "5.3.5",
+  "version": "5.4.0",
   "description": "This is a calendar widget for Mendix. It shows a Calendar and can render objects as events in it.",
   "license": "Apache License, Version 2.0, January 2004",
   "author": "Mendix 2016",

src/package.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-<<<<<<< HEAD
-    <clientModule name="Calendar" version="5.3.0" xmlns="http://www.mendix.com/clientModule/1.0/">
-=======
-    <clientModule name="Calendar" version="5.3.5" xmlns="http://www.mendix.com/clientModule/1.0/">
->>>>>>> master
+    <clientModule name="Calendar" version="5.4.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="calendar/calendar.xml"/>
             <widgetFile path="calendar/calendar-scheduler.xml"/>