Import from oldSENSE
merged
Merging with master branch
Merge branch 'master' of git://github.com/isenseDev/rSENSE into HM_Hide_Upload

Conflicts:
	app/controllers/users_controller.rb
	app/controllers/visualizations_controller.rb
	app/models/project.rb
	app/models/user.rb
Merge pull request #249 from hmcq6/HM_Hide_Upload

Hm hide upload