pulled and synchronized changes
up to date
Merge branch 'master' of https://github.com/elim2g/GreenstorM.git

Conflicts:
	build/PaperMiner.war