Pics
Merge branch 'master' of https://github.com/Torsten90/PicSpot

Conflicts:
	src/com/example/picspot/LoginFragment.java
	src/com/example/picspot/MainActivity.java
mErge