reintegrating the static files
integrating some comments from production server
Merge branch 'master' of https://github.com/fpbattaglia/func_tests