felrapport
Merge branch 'master' of github.com:Jaeensson/tig063Vgr

Conflicts:
	res/layout/activity_rapport.xml