move AWS to environment
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/env/development.json
	config/env/production.json
	config/env/test.json