Merge branch 'master' into dev
css bug fix
Merge branch 'dev'

CSS Bug Fix. Added the ability to set custom paths for inspector css and fontawesome.