Adding Javascript runtime to MarkUs
Fix for issue 1333 with help of @tiagochst
Warn user if bundler version is to low

As we are enabling the support for ruby 2.0 platform (mri_20 in
Gemfile), we need to have Bundler >= 1.3.5
Fix for issue 1333 with help of @tiagochst
Removing blank spaces and lines
Merge branch 'issue-1333' of github.com:rafaspadilha/Markus into issue-1333

Conflicts:
	app/controllers/assignments_controller.rb
Added functional tests for hidden assignments
Updated student id reference to grade_entry_student
Merge pull request #1401 from beepted/issue-1375

Closes #1375: Fixed Download Grades Spreadsheet Error
Fix for issue 1333 with help of @tiagochst
Removing blank spaces and lines
Added functional tests for hidden assignments
Fixing the routing problem
Adding the pt locales for hidden assignments
Merge branch 'issue-1333' of github.com:rafaspadilha/Markus into issue-1333

Conflicts:
	app/controllers/assignments_controller.rb
	app/views/shared/_assignments_dropdown_menu.html.erb
Merge pull request #1357 from rafaspadilha/issue-1333

Closes #1333 - Possibility to hide assignments
Merge pull request #1336 from benjaminvialle/execjs

Adding Javascript runtime to MarkUs
Merge pull request #1386 from benjaminvialle/bundler

Warn user if bundler version is to low
Merge branch 'master' into help-system