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
'Experiment Templates' link now redirects to the correct page, fixed a typo
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
Merge pull request #89 from efairbanks/master

Cosmetic changes
fixed a merge issue
fix a merge issue
Merge pull request #88 from Evana13G/ExperimentTemplate

Experiment template
Hassan swapped around Latitude and Longitude to be their own types
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fieldgeolocation
Merge pull request #90 from efairbanks/fieldgeolocation

Fieldgeolocation
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Manual entry now goes to the right page. Maps now work\!
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 pull request #92 from jdalphon/master

Visualization fixes
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
Merge branch 'master' of https://github.com/isenseDev/rSENSE into mm91