-Fixed overflow when editing session name.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm190

Conflicts:
	app/assets/stylesheets/application.css
-redo?
Merge pull request #228 from mmcguinn/mm190

Mm190
Merge branch 'master' of git://github.com/isenseDev/rSENSE into generalChanges