Separated CSV upload and Field Templating
Merge pull request #293 from hmcq6/HM_Broked_CSV_Upload

Separated CSV upload and Field Templating
Removed extranious $("#csv_form").submit() that was causing a 404 on projects#show
Merge pull request #294 from hmcq6/HM_404_Projects_Show

Removed extranious $("#csv_form").submit() that was causing a 404 on projects#show
-Modified highcharts source to allow for much larger timeline views.
-Changed the "non-date" timeline mode to switch over when a date is given in LT format that does not fit in a js date object.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm277
Merge pull request #295 from mmcguinn/mm277

Mm277
-Removed the gem lock file from source control.
Merge pull request #296 from mmcguinn/mm277

-Removed the gem lock file from source control.
-Fixed bad jquery (on -> live).