Merge pull request #6 from lumasepa/master

django 1.6.2 + rest_framework 2.2.7
Deshabilitando Debug
Merge branch 'master' of https://github.com/tic-ull/arritranco
Adding project name in the scheduler import due to name collision
Adding filter to VirtualMachine query in MachinesUPSProperty view
Fixed backups rest view not showing server for backuptask.
Cleaning up settings.py file
Fixing typos using admin template tag
Adding deployed-static to .gitignore
Merge https://github.com/tic-ull/arritranco into NRPE
merge with https://github.com/tic-ull/arritranco.git and added dir keys