Layout problems
Merge branch 'master' of https://github.com/GQNC-IT/FieldBook-0.2

Conflicts:
	FieldBook/res/layout/fragment_fieldbook_display.xml