readjust structure
Merge branch 'master' of github.com:Kuloud/RecyclerView

Conflicts:
	src/main/.classpath
	src/main/project.properties