Merge branch 'next'

# Conflicts:
#	assets/js/app/apis/apis.html

.jshintrc

@@ -0,0 +1,5 @@
+{
+  "globals": { "sails": true },
+  "node" : true,
+  "asi" : true
+}

CHANGELOG.md

@@ -95,3 +95,24 @@ All notable changes to this project will be documented in this file.
 * Relative paths support for assets and sails.io.
 * Local db path is now configurable and persistent in docker image with it's own volume.
 
+
+## [0.7.1](https://github.com/pantsel/konga/releases/tag/v0.7.1) - 16-5-2017
+
+* Fixed bug that updated localStorage user when performing a user update even if the acting user wasn't the same.
+* Added the --harmony parameter on start.sh fixing Node version compatibility issues with some modules (nodemailer)
+
+
+## [0.7.2](https://github.com/pantsel/konga/releases/tag/v0.7.2) - 17-5-2017
+
+* UI/UX improvements.
+* User sign up.
+* More configurable application settings.
+
+
+## [0.7.3](https://github.com/pantsel/konga/releases/tag/v0.7.3) - 23-5-2017
+
+* UI/UX revamp.
+* Massive refactoring and logic improvements.
+* Configurable user permissions.
+* Various bug fixes and improvements.
+

Dockerfile

@@ -1,5 +1,3 @@
-# Note that if you want to build Konga from here,
-# you must < cd frontend && gulp dist > first
 
 FROM mhart/alpine-node
 

README.md

@@ -9,7 +9,6 @@
 
 [Site and working demo here](https://pantsel.github.io/konga/)
 
-> Konga [0.7.0](https://github.com/pantsel/konga/tree/konga-070) is underway and introduces new cool features like consumers exporting, Node and API health checks as well as Email notifications. Whoever wants to test it and drop some feedback is most welcome to do so. Don't forget to run Konga in dev mode once so that the db changes will be applied.
 
 ## Summary
 

api/base/KongController.js

@@ -1,8 +1,10 @@
 'use strict';
-var KongService = require('../services/KongService')
 
+var KongService = require('../services/KongService')
+var unirest = require("unirest")
 
 module.exports = {
+
     create : function(req,res) {
         return KongService.create(req,res)
     },