hope I nailed it...
Merge branch 'master' of https://github.com/kirill578/Android-Sorted-Res-Folder

Conflicts:
	eclipse_update_site/plugins/org.eclipse.ui.android.sorted.res_1.0.0.201405030549.jar