Merge branch 'master' of https://github.com/ThodorisElissaios/YdroManager

Conflicts:
	app.js