Profile Settings Integration, ServerDemoProile created
Thumbnail adapter edited, update account edited
Merge branch 'Demo'
Merge branch 'Demo'
Merge branch 'Demo'
Integration
BEFORE adding Ibrahim work ..
Before adding Ibrahim WORK
AFTER: adding IBRAHIM work
Merge branch 'Demo' of https://github.com/404Tracker/ChefNetwork

Conflicts:
	app/src/main/java/com/example/chef/chefnetwork/MainActivity.java
Merge remote-tracking branch 'origin/Demo'
AFTER: adding IBRAHIM work
App Icon
Merge branch 'master' into master_After

Conflicts:
	app/app.iml
	app/src/main/AndroidManifest.xml
App Icon
Merge remote-tracking branch 'origin/master' into master_After
Creating ConnectionManagerFasade Tamplate
Creating ConnectionManagerFasade Tamplate
Working with esa
Working with esa