Merge branch 'master' of https://github.com/inez/stuff

Conflicts:
	stuffapp/res/layout/fragment_details.xml
	stuffapp/src/com/stuff/stuffapp/fragments/DetailsFragment.java