Properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	FieldNotebook/project.properties
Start of multilayouts still bugs
Fixed myMarkersToStringMarkers function
Pulled in note.xml changes, for multiline comment on note
Merge remote-tracking branch 'origin/master'
Changed xml colors of note and slider.
Broke slider into fragments, tablet view, started object slider on bottom of notes, lined note view in open note.
Fixed merge conflicts, tablet view/phone view working.

Merge branch 'multilayouts'

Conflicts:
	FieldNotebook/res/layout/fragment_slider.xml
	FieldNotebook/res/layout/note.xml
	FieldNotebook/res/layout/note_open.xml
Added icons for object count on closed note, added code for count number
fkjn
Merge branch 'master' of https://github.com/cyrusbowman/FieldNotebook

Conflicts:
	FieldNotebook/src/com/openatk/fieldnotebook/notelist/FragmentNoteList.java

commit 21st nov
jhjh