Merge remote branch 'origin/development' into text_themes

Conflicts:
	client/src/app.js

diff --cc client/src/app.js
index b17ddb5ef454d82d47fb43729f52a0d164074121,292010fdfba1757cb864b5e7a3b9760152b2301e..6379c25b7dde84233c172b969462b304570dc638
--- 1/client/src/app.js
--- 2/client/src/app.js
+++ b/client/src/app.js
@@@ -109,11 -109,11 +109,11 @@@ _kiwi.global = 
      },\r
  \r
      // Entry point to start the kiwi application\r
-     start: function (opts, callback) {\r
+     init: function (opts, callback) {\r
 -        var continueStart, locale;\r
 +        var continueStart, locale, igniteTextTheme, text_theme;\r
          opts = opts || {};\r
  \r
-         continueStart = function (locale, s, xhr) {\r
+         continueInit = function (locale, s, xhr) {\r
              if (locale) {\r
                  _kiwi.global.i18n = new Jed(locale);\r
              } else {\r
@@@ -146,18 -140,19 +146,26 @@@
  \r
          locale = _kiwi.global.settings.get('locale');\r
          if (!locale) {\r
-             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);\r
+             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueInit);\r
          } else {\r
-             $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);\r
+             $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueInit);\r
          }\r
 +\r
 +        text_theme = opts.text_theme;\r
 +        if (!text_theme) {\r
 +            $.getJSON(opts.base_path + '/assets/text_themes/default.json', igniteTextTheme);\r
 +        } else {\r
 +            $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', igniteTextTheme);\r
 +        }\r
+     },\r
+ \r
+     start: function() {\r
+         _kiwi.app.showStartup();\r
+     },\r
  \r
 -        _kiwi.app.startup_applet_name = startup_applet_name;\r
+     // Allow plugins to change the startup applet\r
+     registerStartupApplet: function(startup_applet_name) {\r
++        _kiwi.app.startup_applet_name = startup_applet_name;
      }\r
  };\r
  \r

diff --cc client/src/index.html.tmpl
Simple merge

diff --cc client/src/models/application.js
Simple merge