Merge pull request #122 from matthesrieke/feature-update-user-profile

merging due to high urgency.
removed unused/not working analysis pages
Merge pull request #142 from nuest/master

removed unused/not working analysis pages
Merge branch 'master' into dev

Conflicts:
	community_speed_difference.php
	community_speed_difference2.php
Update lang_de.php

updated beta phase
Update lang_en.php
Update lang_en.php
add some static images, globally available
add more static images
Merge pull request #178 from enviroCar/dev

Update work by Martin
move high resolution images to static/images/hi
add low resolution static images
merge branch 'dev'
Fixed typo in contributor name
Merge pull request #191 from enviroCar/dev

Content update
comment out about_aboutText4 divs (the App)
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	about.php