cleaned up margin on login dialog, description textbox from Okay to OK, description textbox no longer accepts special characters
fix merge conflicts
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
added new icon, removed isense logo from top
fix merge conflict
merge conflict
fix merge conflics
Merge remote-tracking branch 'origin/bd859' into bd859
New background color for button, app background is now default, re-designed the bottom bar
you can push upload menu button if you do not have connection
double press back to exit no longer passed a waffle.image_check
changes to landscape
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
updated landscape layout
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
fix merge errors
changes to layout landscape