Nothing yet
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_Fix_File_Upload
Add Rubocopy; Fix a million style issues.
Fixed with a simple html trick
Update Rubocop output format to figure out what's up with Travis.
Modify Rubocop config to ignore vendor subtree.
Removed accidental comment
Merge branch 'master' of https://github.com/isenseDev/rSENSE into rubocop

Conflicts:
	app/controllers/home_controller.rb
	config/routes.rb
Fix Jim's style violations.
Make rubocop fail.
Now make it not fail.
Remove some silly puts lines.
Merge pull request #1408 from NatTuck/rubocop

Rubocop
Style check coffeescript files.
Merge pull request #1407 from hmcq6/HM_Fix_File_Upload

Hm fix file upload
Remove stray backtick.
Merge pull request #1410 from NatTuck/coffeelint

Style check coffeescript files.
Addresses issue #1273
Merge branch 'master' of https://github.com/isenseDev/rSENSE into jk1273

Conflicts:
	app/assets/javascripts/projects/show.js.coffee
	app/controllers/data_sets_controller.rb
	app/models/user.rb
	db/schema.rb