Se creo el dashboard de administrador
jtables sin funcionar con administrador
Cambios en app.js
Se configuró el uso correcto de las jTables
Merge branch 'jTables'

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	.idea/Vanpool.iml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/sessions_controller.rb
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/CTrevar/Vanpool

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/jtable.js
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	config/routes.rb
	db/schema.rb