#330 - Fix errors
Merge branch 'frontend_integration' of https://github.com/ndomar/megasoft-14 into frontend_integration
Fix error - #330
Merge branch 'frontend_integration' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#X_migrating_to_server

Conflicts:
	Entangle/entangle-android/bin/AndroidManifest.xml