Merge remote-tracking branch 'origin/master' into 0.5.1

public/src/ajaxify.js

@@ -204,7 +204,6 @@ var ajaxify = ajaxify || {};
 		}
 
 		var location = document.location || window.location,
-			api_url = (url === RELATIVE_PATH || url === '/' + RELATIVE_PATH) ? 'home' : url,
 			tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]);
 
 		if (!tpl_url) {
@@ -212,7 +211,7 @@ var ajaxify = ajaxify || {};
 		}
 
 		apiXHR = $.ajax({
-			url: RELATIVE_PATH + '/api/' + api_url,
+			url: RELATIVE_PATH + '/api/' + url,
 			cache: false,
 			success: function(data) {
 				if (!data) {

src/routes/index.js

@@ -19,7 +19,7 @@ var nconf = require('nconf'),
 
 function mainRoutes(app, middleware, controllers) {
 	app.get('/', middleware.buildHeader, controllers.home);
-	app.get('/api/home', controllers.home);
+	app.get('/api', controllers.home);
 
 	app.get('/login', middleware.redirectToAccountIfLoggedIn, middleware.buildHeader, controllers.login);
 	app.get('/api/login', middleware.redirectToAccountIfLoggedIn, controllers.login);