Changes
Merge remote-tracking branch 'origin/devAbel' into devAbel

Conflicts:
	package.json