add part of acceptance test
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
found remove icon to use until the swipe motion can be added in
Merge branch 'master' into remove_song_from_playlist
add support for our diary
add newrelic.properties to git ignore and remove file
instructions for newrelic.properties
added intent structure and started messaging
remove keystore ignore
make folder
grr runons, location change
removing messaging things
removed all messaging things
update to ignore ant files
Merge pull request #85 from reidbaker/add_diary

add support for our diary
fixed up ui testing
enabled removal from both host and guest devices
Merge branch 'master' into remove_song_from_playlist