Merge branch 'jd_issue1' of github.com:jdalphon/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
Initial moving of session creation to experiment page
Merge pull request #110 from jdalphon/master

Initial movement of create session functionality to experiments page
Fixed media objects once and for all.
Merge pull request #111 from jdalphon/master

Fixed media objects
Added migrations
Merge pull request #112 from jdalphon/master

Added media objects migration
The password fields tase like password fields...
Added media_type to redactor image upload to media_object
Merge pull request #113 from jdalphon/GeneralChanges

General changes
Who broke Rake?
-Changed manual entry to not use editable grid.
-Added manual entry validation (except date).
-Added forgotten vis file.
-Added input validation lib.
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge pull request #115 from mmcguinn/master

New manual entry with validation
Merge branch 'master' of git://github.com/isenseDev/rSENSE into GeneralChanges
Merge branch 'master' of git://github.com/isenseDev/rSENSE
-Switched google maps back to be loaded on demand (otherwise it doesn't work).