Merge with Neonunux repository

Update various methods: fileController mostly