use the correct javascript and added theme functionality
Merge commit '144433ed7965b16b92cf25618d8c83001612bf5b'
Merge commit '0e66600652b2c9fab36f0bbacd2b978b5e3dcb80'
Merge commit 'c7860759fe698e13d1495c9f7f4d3dd6a20a9414'
Merge commit 'c30f3d06738d43e0ce03ae83ed6afeb3ddf387aa'
Merge commit '2a658804ceb50a9d332faed52cd4331b35095357'
Merge commit 'ad365db76fe0b55c5819658a378e908e3461f48c'
Merge commit 'c6ecf4805ea3968c863a4c85922a83479858d64a'
Merge commit '5052843b3fd0209965fdaefcfd8a48112b76d4af'
Merge commit '95b14e32ac585a0aced849729e63b8cefb83ac27'
Merge commit 'a1106ddf68c8efaf9a784d7a9d2b5672e2e9cafa'
Merge commit '3520759913817e3b4590ef67191bdc091ba190c9'
switch to roadmap instead of terrain
Merge pull request #70 from joshh/master

gmap fix and looks like a mobile fix
small fixes
vf fixes
Merge remote branch 'upstream/master'
fix image padding
comment
Merge pull request #71 from will123195/master

vf fixes