Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Fixing the format of the tables on the projects show page
Merge branch 'master' of git://github.com/isenseDev/rSENSE into updateProjectsPage
Fixing some formatting that was in conflict with Hassans last pull
Changed the media objects box to not be tables. Some css changes
added title to media objects table
Merge pull request #464 from jdalphon/updateProjectsPage

Integrating my previous changes with hassans
-Re-did register page in rSense style instead of being a default rails form.
-Fixed some user error messages.
-Fixed the user edit page to actually be able to delete users.
Merge branch 'master' of github.com:isenseDev/rSENSE into register
Merge branch 'master' of github.com:isenseDev/rSENSE into register
-Fixed bad link to edit dataset on user page.
Merge pull request #465 from mmcguinn/register

Register
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Merge branch 'Littlefixes' of git://github.com/kcarcia/rSENSE into mergy

Conflicts:
	app/models/user.rb
Merge pull request #466 from mmcguinn/mergy

Merge for PR #463
Adding delete and edit functionality for media, Delete row from dom after hiding
Adding pill boxes around redactor edit buttons
-Changed the 'people' links to say 'users' in the title bar.
-Added some basic page title generation (#440 (1)).
-Fixed like text #440 (6)