changed path
added some dummy locations in weimar
merged new stuff from master into feature/map
added locations (marker) from locationstore
further development: locationview with link to map ...

from second session
posting location with lat and lon to server

php script not committed
postdata script for lat,lon,name

has to be in htdocs folder under "MIS/project/"
Further development: UploadActivtiy

Upload activity has a few new ui elements
also, new class for the popup for tag adding
we'll see if that works on a phone that's not completely ready for
compostation // penis
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	PublicScreeningNavigationApp.iml
use buildToolsVersion "19.1.0" now 'cause of android studio update
example design
get locations from server only. tags missing
running server support with tags, descriptions and local copy of new created locations
upload taken picture to server
add image path to database
just new photo
nix
fixed
merged develop into new server stuff
Thousands of bullshits

Fuck you, AS!