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