restore manifest
restore ContactsDialog
remove parse broadcast receiver
restore fluffview / delete button test. Merge should now be complete, but need to double check gcm stuff