Merge branch 'jd_issue1' of github.com:jdalphon/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
added '_display_experiment_templates' partial and changed index.js.erb to point to correct path, and refined the index.html.erb to render the correct partial
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
Merge branch 'master' of https://github.com/isenseDev/rSENSE into mm91
added '_display_experiment_templates' partial and changed index.js.erb to point to correct path, and refined the index.html.erb to render the correct partial
-Fixed google maps api import params.
-Merged in new date parser from iSENSE.
-Fixed normal fields definition so geospatial is excluded.
-removed moment.
changed that displayVis page to change the editing capabilites of the title of the page
-Reorganized js to keep and load libraries correctly.
Changed name of 'Experiment Templates' link to 'Store' and changed the title of the page to 'Experiment Store'
Merge pull request #94 from mmcguinn/mm91

Mm91
fixing merge