elastic seach start
fixed specs a bit and elastic things
elastic test
elastic search at its glance.... autocomplete finished for now
merged
updated readme
formatting
Update README.rdoc
travis does not support our plugin ... blaaha
Merge branch 'elastic' of github.com:fairnopoly/fairnopoly into elastic
travis elastic tryout
travis elastic tryout
blank label
fuzziness reduced
categories refactored
categories and search form refactored
Merge branch 'develop' into feature-5-grid

Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/index.html.haml
	app/views/articles/shared/_articles_grid.html.haml
	app/views/categories/index.html.haml
merge fixes
saving latest changes