finished Intro until now --> all features are now included
Merge branch 'master' of https://github.com/froehr/Disaster-Management-2014