Signed-off-by: Roet-Ivar <nicoful@gmail.com>
Signed-off-by: Roet-Ivar <nicoful@gmail.com>
Merge branch 'master' of git@github.com:gitta-mannen/MMAFL.git into scrapah

Conflicts:
	code/server/src/scraper/Scraper.java

Signed-off-by: Roet-Ivar <nicoful@gmail.com>
Signed-off-by: Roet-Ivar <nicoful@gmail.com>
Signed-off-by: Roet-Ivar <nicoful@gmail.com>
Merge branch 'scrapah' of git@github.com:gitta-mannen/MMAFL.git
Some big changes in both scraper, settings and dbHandler as well as the
settings.xml structure.

Changed to a scraperTask format.

Signed-off-by: gitta-mannen <mail@janpettersson.com>