cont. EC2
Merge branch 'master' of https://github.com/Fathalian/nestor

Conflicts:
	app/scripts/services/awsComponents.js
Merge branch 'master' of https://github.com/Fathalian/nestor