Merge branch 'master' into stop-the-bleeding

# Conflicts:
#	dist/booking.js.map
#	dist/booking.min.js

README.md

@@ -264,15 +264,15 @@ localization: {
 },
 ```
 
-For full language support, FullCalendar also takes a ["lang" option](http://fullcalendar.io/docs/text/lang/), accompanied by a language file. Make sure to use defer attribute on a script tag loading the language file if you are deferring booking.js, language file should be loaded after booking.js, but before initialization.
+For full language support, FullCalendar also takes a ["locale" option](http://fullcalendar.io/docs/text/lang/), accompanied by a language file. Make sure to use defer attribute on a script tag loading the language file if you are deferring booking.js, language file should be loaded after booking.js, but before initialization.
 
 Remember to set `localization.timeDateFormat` to false so it doesn't override the language file's settings.
 
 See `/examples/local-language.htm`
 
 ```javascript
 fullCalendar: {
-  lang: 'de'
+  locale: 'de'
 },
 localization: {
   timeDateFormat: false

dist/booking.js

@@ -843,7 +843,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  // Get library version
 	  var getVersion = function() {
 
-	    return ("1.16.0");
+	    return ("1.17.0");
 
 	  };
 
@@ -1031,7 +1031,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @type {Object}
 	   */
 	  var config = {
-	    app: 'demo',
+	    app: '',
 	    apiBaseUrl: 'https://api.timekit.io/',
 	    apiVersion: 'v2',
 	    convertResponseToCamelcase: false,
@@ -1085,10 +1085,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // add http headers if applicable
 	    args.headers = args.headers || headers || {};
 
-	    if (!args.headers['Timekit-App']) args.headers['Timekit-App'] = config.app;
-	    if (config.inputTimestampFormat) { args.headers['Timekit-InputTimestampFormat'] = config.inputTimestampFormat; }
-	    if (config.outputTimestampFormat) { args.headers['Timekit-OutputTimestampFormat'] = config.outputTimestampFormat; }
-	    if (config.timezone) { args.headers['Timekit-Timezone'] = config.timezone; }
+	    if (!args.headers['Timekit-App'] && config.app) {
+	      args.headers['Timekit-App'] = config.app;
+	    }
+	    if (config.inputTimestampFormat) {
+	      args.headers['Timekit-InputTimestampFormat'] = config.inputTimestampFormat;
+	    }
+	    if (config.outputTimestampFormat) {
+	      args.headers['Timekit-OutputTimestampFormat'] = config.outputTimestampFormat;
+	    }
+	    if (config.timezone) {
+	      args.headers['Timekit-Timezone'] = config.timezone;
+	    }
 
 	    // add auth headers if not being overwritten by request/asUser
 	    if (!args.headers['Authorization'] && userEmail && userToken) {

examples/local-language.htm

@@ -11,7 +11,7 @@
 
   <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
   <script type="text/javascript" src="../dist/booking.js"></script>
-  <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.4.0/lang/de.js"></script>
+  <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.4.0/locale/de.js"></script>
   <div id="bookingjs">
     <script type="text/javascript">
       TimekitBooking().init({
@@ -22,7 +22,7 @@
         avatar:   '../misc/avatar-doc.jpg',
         app:      'back-to-the-future',
         fullCalendar: {
-          lang: 'de'
+          locale: 'de'
         },
         localization: {
           timeDateFormat: false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timekit-booking",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Make a beautiful embeddable booking widget in minutes",
   "main": "dist/booking.min.js",
   "repository": {