Merge origin/dev-master into dev-master

Conflicts:
	public/app/controller/admin/Resources.js