Merge branch 'master' of https://github.com/Javran/Twidere-Android into Javran-master

Conflicts:
	.gitignore