Merge pull request #1 from PHPSP/master

Merge PHPSP
Descrição sobre AWS
Merge pull request #10 from diegocpires/master

Descrição sobre AWS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	WorkingGroups/PHPSP+Pub/sharkbowl-2014-07-10.md