Merge pull request #5 from karasu/master

Push request - User info screen
Merge pull request #6 from karasu/master

Pull request - Slide screen and TODO list
updated geo url
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/timezone.py