Copied across the Formal files and fixed issue #26
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/src/main/java/com/johnston/lmhapp/Settings/SettingsListAdapter.java