Merge pull request #7 from itcc-li/sprint2

Sprint2
Merge pull request #8 from itcc-li/sprint2

Sprint2
Merge pull request #9 from plon33r/tmp

Tmp
gallery issue
Merge pull request #10 from plon33r/tmp

gallery issue
album refresh
Merge branch 'dev' into sprint2

Conflicts:
	Hackathon[2014]/gen/.gitignore
	Hackathon[2014]/res/values/strings.xml
Merge branch 'release_0_1' of github.com:itcc-li/hackathon-2014-android
into release_0_1

Conflicts:
	Hackathon[2014]/res/values/strings.xml
Merge pull request #44 from simonmeier/release_0_1

newest from simon and egon
Merge pull request #17 from itcc-li/release_0_1

Release 0 1
.
Merge branch 'sprint2' of
https://github.com/Arthur26/hackathon-2014-android.git into sprint2

Conflicts:
	Hackathon[2014]/res/values/strings.xml
.
.
Merge pull request #45 from Arthur26/sprint2

Sprint2
Merge pull request #7 from itcc-li/release_0_1

Release 0 1