merge all
Merge branch 'feature/dev-eddie-extends-develop' into feature/dev-yuyu

Conflicts:
	public/js/main.js