Pre-mastermerge commit
Merge branch 'master' of gitlab.bucknell.edu:krg006/notebooks into file_system
added erase swatch to slide_menu, fixed error with two_finger_scrolling,
cleaned up onInterceptTouchEvent() code
fix email?
resolved conflicts
Added icons, proper menus, saving in onPause, fixed back/up buttons, implemented notepage overflow menu, added default thumbnail for notes and loaded thumbnail in separate thread, working on NewNoteDialog
added files
fixed email
made additions to erase functionality
eraser working better
Merge remote-tracking branch 'origin/file_system'

Conflicts:
	Notebooks/res/values/colors.xml
	Notebooks/src/com/ctk/notebooks/NoteActivity.java
Working on implementing a vertical scroll bar for changing writing size
vertical seek bar displays - stable - now to implement functionality
Some progress made on seek bar
cleaned up code
fixed changing color error, cleaned up code
finished all send
minor changes, about to make slide_menu color selection more dynamic
Merge remote-tracking branch 'origin/pdf' into slide_menu

Conflicts:
	Notebooks/src/com/ctk/notebooks/NotebookNotesActivity.java
fixed minor issue with eraser size