Article service, feed importer, feed collector
Update
Bugfix for indeing sevice
Update
Updated
Merge branch 'master' of code.nuus.ch:nuus
added pem
Parametrized indexing service
Parametrized indexing service
Added scripts
Merge branch 'master' of code.nuus.ch:nuus
bugfix for indexing service
Merge branch 'master' of code.nuus.ch:nuus

Conflicts:
	services/articles/.idea/inspectionProfiles/profiles_settings.xml
	services/clustering/.idea/workspace.xml
Did some work on the web
Merge branch 'master' of code.nuus.ch:nuus
Added upstart script for indexing
Added upstart script for indexing
Merge branch 'master' of code.nuus.ch:nuus
Adapted install script
Parametrized services and programs