Jul 31st 2014
Merge branch 'master' of https://github.com/madhusv/talkback

Conflicts:
	authenticator.py
	session.py