fix_Design
add drawable
Fix conflict
Add xml Design of ClaimForm
Fix string.xml
Issue #363 - Fix conflicts in layout and values
Issue #363 - Fix conflicts
Issue #363 - Fix conflicts
Issue #363 - Add Files
Issue #128 - modify layout
Issue #128 - change layout
remve bin/manifist
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C3_farghal_#349_UX

Conflicts:
	Entangle/entangle-android/AndroidManifest.xml
Issue #128 - fix date format
add template of invitation stream entry #349
Merge pull request #373 from ndomar/C3_farghal_#349_UX

C3 farghal #349 ux
Issue #363 - Add designs
Merge pull request #366 from ndomar/C3_silvermist_#31_create_request

S[31] As a tangle member, I want to be able to create and post requests
Issue #363 - Add Request.java
Removing the file