upgrade to rails 4.0
pagination
>>>>>>> test enhanced
Merge branch 'master' of https://github.com/lascar/elemental into HEAD

Conflicts:
	Gemfile
	app/controllers/elements_controller.rb
	spec/controllers/elements_spec.rb
	spec/requests/elements_spec.rb
	spec/views/elements_spec.rb
Merge branch 'master' of https://github.com/lascar/elemental

Conflicts:
	spec/requests/elements_spec.rb
	spec/views/elements_spec.rb
merged