Continuing on Twitter authentication.
Merge branch 'master' of https://github.com/NatPadHack/MtpHackathon2013

Conflicts:
	hackatonServer/conf/routes