Merge branch 'test'
changed CONFIG_FILE path
removed re module
Renamed css and js files
Moved CONFIG_FILE variable
Changed bootstrap css and js to use CDN
Enabled pan control
cleaned up CONFIG
Merge branch 'master' into test