updated .gitignore
removed unused files from CVS
Merge branch 'master' of https://github.com/Javran/Twidere-Android into Javran-master

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