merge stuff
nutch-client initial commit
Merge branch 'master' of https://bitbucket.org/alohinau/smartaggregatorrepo

Conflicts:
	.idea/workspace.xml
added nutch client to parent pom
configuration readme added
some project structure changes + build changes
code refactoring: hadoop job extracted to separate class
[Hadoop cyclic job] move output to Apache derby DB
Workspace
Merge branch 'master' of bitbucket.org:alohinau/smartaggregatorrepo

Conflicts:
	.idea/workspace.xml
[HadoopCyclicJob] remove unused logging, move adapters to API
initial commit of webapp
[HadoopCyclicJob] write articles to apache derby
[HadoopCyclicJob] apply different user client
Merge remote-tracking branch 'origin/master'
webapp initial commit
Merge branch 'master' of https://bitbucket.org/alohinau/smartaggregatorrepo