x.x
Merge branch 'master' of https://github.com/pi13/sw14_free_07.git

Conflicts:
	LVMaster3000/res/menu/fragment_details.xml