some amazon EC2 info
fixed link to movica
Merge remote-tracking branch 'upstream/master'
adapted to local settings