first commit
should work & search
Added remote search as well
added lineshift
fixed and added some tests
added frontpage and cleaned templates/html
Added footer
Tests now run
Added total matches in ads-list
addmany now accepts the number of docs to add
Added Solr-bean
making app ready for heroku
Merge branch 'master' of github.com:fmmr/solrdemo

Conflicts:
	app/controllers/LocalSolr.java
	app/controllers/RemoteSolr.java
	app/utils/Timer.java
	app/views/ads.scala.html
	app/views/index.scala.html
	app/views/main.scala.html
	conf/routes
	public/stylesheets/main.css
	test/ApplicationTest.java
	test/IntegrationTest.java