last resort
Merge branch 'master' of https://github.com/hesahesa/awaslu.git

Conflicts:
	javascript/NeoClient/client.js
	javascript/NeoClient/client.min.js
Merge branch 'master' of https://github.com/hesahesa/awaslu.git

Conflicts:
	javascript/NeoClient/client.js
	javascript/NeoClient/client.min.js