pic stuff
feer
ddfdssdf
Merge branch 'master' of https://github.com/Torsten90/PicSpot

Conflicts:
	bin/classes/com/example/picspot/Objects/User$1.class
	bin/classes/com/example/picspot/SpotListFragment$1.class
	src/com/example/picspot/GalleryFragment.java
	src/com/example/picspot/Objects/Pic.java
	src/com/example/picspot/Objects/Spot.java
PReLAst
Merge branch 'master' of https://github.com/Torsten90/PicSpot

Conflicts:
	res/layout/add_pic_selection.xml
	src/com/example/picspot/MainActivity.java
	src/com/example/picspot/MainScreenFragment.java
FINAL