update admin
merge admin
merge admin
merge admin
Merge branch 'master' of https://github.com/ju2cho7/aerodrome

Conflicts:
	web/fr/common/js/mock/get.js
	web/fr/common/js/services-ajax.js