Solr stup
Added tmp folder with .gitignore
Added grunt-forever
Better paths
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json