Bugfix and Codeconvention
Bugfix and Codeconvention

Fixed the bug, that the features are always added again, when using the
spatial filter.
Also doing some codevonvention correction

froehr/Disaster-Management-2014,froehr/Disaster-Management-2014,froehr/Disaster-Management-2014,froehr/Disaster-Management-2014,froehr/Disaster-Management-2014