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
Made title on sessions page pretty
Changed the info/_edit_info.html.erb partial to create a hyperlink and redirect to the correct page
Merge branch 'master' of git://github.com/isenseDev/rSENSE into GeneralChanges
Changed the hyperlink of usernames on the user/index page to redirect to the correct page
Made time format prettier
Merge branch 'master' of git://github.com/isenseDev/rSENSE into GeneralChanges
Merge pull request #108 from Evana13G/GeneralChanges

General changes
Merge pull request #109 from jdalphon/fix_login

Fixed a small bug with login
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