Initial version
Merge branch 'master' of https://github.com/Getshi/videovigilancia-1314-g08