Merge branch 'master' of github.com:SmartCrowd/SuddenTwitter

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'