Fixed merge errors
Merge branch 'dev' of https://github.com/adambarreiro/watchFire.git into dev