Crashes at runtime. Are the files up to date?

[dgorrd]

When I build and run the app, the tools and swatches don't load completely. The action bar works, as does the logotool, but the pentools and swatches are broken. No icons are visible, a small, white pentool is active by default and can be drawn with, but when I try to change the tool or swatch color the app crashes. Are all the files here complete, and up-to-date?

[dsandler]

There's a bunch of stuff that's in the "wear" branch that I never merged to master. Try that first.

[dgorrd]

Ok, I will try the "wear" branch. I should point out that the app version on the Play store works fine, so whatever files/branch that were used to build that is known to be good.

[dgorrd]

I tried loading in the changed files but I still get several errors on build.
In MarkersActivity
import org.dsandler.apps.markers.R; cannot be resolved
(SwatchButton) mLastColor).getColor() cannot be resolved
MediaClient cannot be resolved
MarkersUtils cannot be resolved
In Slate
import org.dsandler.apps.markers.R; cannot be resolved

 I thought this would build and run from the start since the app from the Play Store is working. Are there other files/libs missing from org.dsandler.apps.markers, or other merge problem?