Signed-off-by: svenake <svenake@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties


Signed-off-by: svenake <svenake@gmail.com>